Althars123 3 years ago
parent
commit
2932b58c90

+ 8 - 3
zzjs-admin/src/main/java/com/miaxis/app/controller/film/FilmNotifyController.java

@@ -101,6 +101,7 @@ public class FilmNotifyController {
                     try {
                         sendXcxMessage(wxOrder);
                     } catch (Exception e) {
+                        e.printStackTrace();
                         throw new CustomException("订单:"+wxOrder.getOutTradeNo()+"推送消息失败");
                     }
                 }
@@ -128,7 +129,7 @@ public class FilmNotifyController {
 
         }
 
-        wxOrderService.updateById(wxOrder);
+       // wxOrderService.updateById(wxOrder);
 
         FilmNotifyReturnDTO filmNotifyReturnDTO = new FilmNotifyReturnDTO();
         filmNotifyReturnDTO.setCode("200");
@@ -141,7 +142,7 @@ public class FilmNotifyController {
         String xcxMessageToken = wxXcxMessageService.getXcxMessageToken();
         WxSend wxSend = new WxSend();
         //wxSend.setAccess_token(xcxMessageToken);
-        String openid = SecurityUtils.getLoginUser().getStudent().getOpenid();
+        String openid = wxOrder.getOpenid();
         wxSend.setTouser(openid);
         wxSend.setTemplate_id("Q4-tQrDwtzFUSLt_PR2kuTxBJ3d62V4Yp2iwx4PAcIE");
         wxSend.setPage("/pages/cinema/orderdes?outTradeNo="+wxOrder.getOutTradeNo());
@@ -154,7 +155,7 @@ public class FilmNotifyController {
         JSONObject jsonObject5 = new JSONObject();
 
         jsonObject1.put("value",wxOrder.getOutTradeNo());
-        jsonObject2.put("value","¥"+wxOrder.getTotal());
+        jsonObject2.put("value","¥"+wxOrder.getTotal()/100.0);
         jsonObject3.put("value",new SimpleDateFormat("yyyy年MM月dd日 HH:mm").format(new Date()));
         jsonObject4.put("value","电影票");
         jsonObject5.put("value","点击查看取票二维码");
@@ -183,4 +184,8 @@ public class FilmNotifyController {
         Boolean success;
     }
 
+    public static void main(String[] args) {
+        System.out.println(3680/100.0);
+    }
+
 }

+ 37 - 23
zzjs-admin/src/test/java/com/miaxis/test/NormalTest.java

@@ -2,8 +2,14 @@ package com.miaxis.test;
 
 import com.alibaba.fastjson.JSONObject;
 import com.miaxis.ZzjsApplication;
+import com.miaxis.common.enums.OrderStatusEnum;
+import com.miaxis.common.exception.CustomException;
+import com.miaxis.feign.dto.FilmDTO;
+import com.miaxis.feign.dto.FilmMcpData;
+import com.miaxis.feign.dto.FilmXdResult;
 import com.miaxis.wx.domain.WxOrder;
 import com.miaxis.wx.dto.WxNotifyReturnDTO;
+import com.miaxis.wx.dto.WxOrderCreateDTO;
 import com.miaxis.wx.service.IWxOrderService;
 import com.miaxis.wx.service.IRefundRecordService;
 import com.wechat.pay.contrib.apache.httpclient.auth.AutoUpdateCertificatesVerifier;
@@ -11,11 +17,15 @@ import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.scheduling.concurrent.ThreadPoolTaskExecutor;
 import org.springframework.test.context.ActiveProfiles;
 import org.springframework.test.context.junit4.SpringRunner;
 
 import java.math.BigInteger;
 import java.security.cert.X509Certificate;
+
+import static com.miaxis.common.utils.OrderCodeFactory.getOrderCode;
+
 //@ActiveProfiles("prod")
 @SpringBootTest(classes = ZzjsApplication.class)
 @RunWith(SpringRunner.class)
@@ -28,6 +38,10 @@ public class NormalTest {
 
     @Autowired
     private AutoUpdateCertificatesVerifier verifier;
+
+    @Autowired
+    private ThreadPoolTaskExecutor threadPoolTaskExecutor;
+
     @Test
     public void test1() throws Exception {
         WxOrder wxOrder = wxOrderService.getByOutTradeNo("12021060816391765454799220937462");
@@ -39,32 +53,32 @@ public class NormalTest {
 
     @Test
     public void test11() throws Exception {
-        WxOrder wxOrder = wxOrderService.getByOutTradeNo("12021052417182038148110033053335");
-        System.out.println(wxOrder.getGoodsType()=="1");
-        System.out.println(wxOrder.getGoodsType().equals("1"));
-//        WxOrder wxOrder1 = wxOrderService.getByOutTradeNo("12021052415260767148145493655617");
-//        refundRecordService.refund(wxOrder1,"12021051815333778448136985596489");
-    }
-
-
-
-    @Test
-    public void test2() throws Exception {
-        X509Certificate validCertificate = verifier.getValidCertificate();
-        BigInteger serialNumber = validCertificate.getSerialNumber();
-        System.out.println(serialNumber);
-
+        threadPoolTaskExecutor.execute(new Runnable() {
+            @Override
+            public void run() {
+                System.out.println(Thread.currentThread()+"aaa");
+
+            }
+        });
+
+        if (true){
+            System.out.println("低分段");
+            threadPoolTaskExecutor.execute(new Runnable() {
+                @Override
+                public void run() {
+                    try {
+                        System.out.println(Thread.currentThread()+"bbb");
+                    } catch (Exception e) {
+                        throw new CustomException("订单:推送消息失败");
+                    }
+                }
+            });
+
+        }
 
     }
 
-    public static void main(String[] args) {
-        Integer a =1;
-        do1(a);
-        System.out.println(a);
-    }
-    public static void  do1(Integer a){
-        a =2 ;
-    }
+
 
 
 

+ 1 - 1
zzjs-common/src/main/java/com/miaxis/common/enums/OrderStatusEnum.java

@@ -7,7 +7,7 @@ package com.miaxis.common.enums;
  */
 public enum OrderStatusEnum
 {
-    PROCESSING("1", "进行中"), SUCCESS("2", "停用"), FAILD("3", "失败");
+    PROCESSING("1", "进行中"), SUCCESS("2", "成功"), FAILD("3", "失败");
 
     private final String code;
     private final String info;

+ 1 - 0
zzjs-service/src/main/java/com/miaxis/wx/service/impl/RefundRecordServiceImpl.java

@@ -54,6 +54,7 @@ public class RefundRecordServiceImpl extends ServiceImpl<RefundRecordMapper, Ref
 
     @Override
     public WxNotifyReturnDTO refund(WxOrder wxOrder, String refundCode) throws Exception{
+        System.out.println("进入退款方法");
         HttpPost httpPost = new HttpPost(wxpayConfig.getV3urlRefund());
         httpPost.addHeader("Accept", "application/json");
         httpPost.addHeader("Content-type","application/json; charset=utf-8");

+ 1 - 1
zzjs-service/src/main/java/com/miaxis/wx/service/impl/WxOrderServiceImpl.java

@@ -63,7 +63,7 @@ public class WxOrderServiceImpl extends ServiceImpl<WxOrderMapper, WxOrder> impl
     private IRefundRecordService refundRecordService;
     @Autowired
     private IFuluService fuluService;
-    @Autowired
+       @Autowired
     private ThreadPoolTaskExecutor threadPoolTaskExecutor;
 
     @Value("${film.notifyUrl}")