更新

src/main/java/com/szwl/controller/TOrderController.java

@@ -1092,7 +1092,9 @@ public class TOrderController {
                 altInfo.add(agencyJson);
                 break;
             case 1:
-                agencyMch = R.getDataIfSuccess(szwlFeign.getMch(String.valueOf(proportion.getAgencyId())));
+//                agencyMch = R.getDataIfSuccess(szwlFeign.getMch(String.valueOf(proportion.getAgencyId())));
+                ResponseModel<TJoinpayMch> mch = szwlFeign.getMch(String.valueOf(proportion.getAgencyId()));
+                agencyMch=mch.getData();
 
 //                agencyMch = mchService.getUniqueness(admin.getAgencyId());
                 selfMch = R.getDataIfSuccess(szwlFeign.getMch(String.valueOf(proportion.getAdminId())));
@@ -2499,6 +2501,9 @@ public class TOrderController {
         String sn = request.getParameter("r2_OrderNo");
         LambdaQueryWrapper<TOrder> query = Wrappers.lambdaQuery();
         query.eq(TOrder::getSn,sn);
+        if(StringUtils.isEmpty(sn)){
+            return "error";
+        }
         List<TOrder> list = orderService.list(query);
         TOrder order = new TOrder();
         if(list.size()>0){
@@ -2530,8 +2535,6 @@ public class TOrderController {
                 e.printStackTrace();
             }
             orderService.updateById(order);
-            //传送数据
-            sentJingZhun(order);
             JSONObject kindData = new JSONObject();
             kindData.put("sn", order.getSn());
             kindData.put("productName", order.getProductName());
@@ -2549,6 +2552,12 @@ public class TOrderController {
                 kindData1.put("mealCode", s);
                 order.setOrderStatus("0");
                 equipmentService.sentMessage(byClientId.getClientId(), PushUtils.buildJson("cardPayXCX", kindData1.toString()).toString());
+                if(StringUtils.isNotEmpty(byClientId.getApkVersion())){
+                    //发送两次mq
+                    if(byClientId.getApkVersion().equals("1.0.131-jz11")||byClientId.getApkVersion().equals("1.0.131-jz12")||byClientId.getApkVersion().equals("1.0.131-jz13")){
+                        sendMqTwo(byClientId.getClientId(),kindData1.toString());
+                    }
+                }
                 TSzsmWx szsmWx = szsmWxService.getById(order.getWxId());
                 BigDecimal integral = szsmWx.getIntegral();
                 if(integral!=null){
@@ -2573,9 +2582,11 @@ public class TOrderController {
             }
 //            PushUtils.push(gtClientId, "支付成功", "您的订单支付成功", PushUtils.buildJson("pay_success", kindData.toString()).toString());
 //            order.setNote(gtClientId + "已推送");
+            orderService.updateById(order);
+            //传送数据
+            sentJingZhun(order);
             try {
                 esTOrderService.insertData(order);
-                orderService.updateById(order);
             }catch (Exception e) {
                 e.printStackTrace();
             }
@@ -2593,7 +2604,37 @@ public class TOrderController {
 
         return "success";
     }
-//    @RequestMapping(value = "/sentJingZhun", method = RequestMethod.POST)
+    //发送两次mq
+    private void sendMqTwo(String clientId, String kind) {
+        // 定时任务1
+        TimerTask timerTask = new TimerTask() {
+            @Override
+            public void run() {
+                equipmentService.sentMessage(clientId, PushUtils.buildJson("cardPayXCX", kind).toString());
+                System.out.println("运行定时任务1：" + clientId);
+
+            }
+        };
+        // 定时任务2
+        TimerTask timerTask1 = new TimerTask() {
+            @Override
+            public void run() {
+                equipmentService.sentMessage(clientId, PushUtils.buildJson("cardPayXCX", kind).toString());
+                System.out.println("运行定时任务1：" + clientId);
+
+            }
+        };
+        // 计时器
+        Timer timer = new Timer();
+        // 添加执行任务（延迟 5s 执行）
+        timer.schedule(timerTask, 5000);
+        Timer timer1 = new Timer();
+        timer1.schedule(timerTask1, 10000);
+//        equipmentService.sentMessage(clientId, PushUtils.buildJson("cardPayXCX", kind).toString());
+
+    }
+
+    //    @RequestMapping(value = "/sentJingZhun", method = RequestMethod.POST)
 //    @ResponseBody
     private void sentJingZhun( TOrder order) {
         order = orderService.getById(order.getId());
@@ -2612,7 +2653,12 @@ public class TOrderController {
                 TSzsmWx szsmWx = szsmWxService.getById(order.getWxId());
                 map.put("sourceChannel","1");
                 map.put("phone",szsmWx.getPhone());
-                map.put("amount",order.getMarketingAmount().toString());
+                if(order.getMarketingAmount()!=null){
+                    map.put("amount",order.getMarketingAmount().toString());
+                }else{
+                    map.put("amount","0");
+                }
+
                 map.put("nickName","1");
                 map.put("uninoId",szsmWx.getOpenId());
             }else {
@@ -2651,7 +2697,10 @@ public class TOrderController {
         String r6_Status = request.getParameter("r6_Status");
         LambdaQueryWrapper<TOrder> query = Wrappers.lambdaQuery();
         query.eq(TOrder::getSn,order_no);
-        List<TOrder> list = orderService.list();
+        if(StringUtils.isEmpty(order_no)){
+            return "error";
+        }
+        List<TOrder> list =orderService.list(query);
         TOrder order = new TOrder();
         if(list.size()>0){
             order = list.get(0);
@@ -2800,8 +2849,11 @@ public class TOrderController {
         String sn = request.getParameter("r2_OrderNo");
         LambdaQueryWrapper<TOrder> query = Wrappers.lambdaQuery();
         query.eq(TOrder::getSn,sn);
-        List<TOrder> list = orderService.list();
-        TOrder order = new TOrder();
+        if(StringUtils.isEmpty(sn)){
+            return  "error";
+        }
+        List<TOrder> list = orderService.list(query);
+        TOrder order = list.get(0);
 
 
         if (JoinpayConstant.r6_Status_100.equals(r6_Status)) {
@@ -2960,6 +3012,9 @@ public class TOrderController {
         String sn = request.getParameter("r2_OrderNo");
         LambdaQueryWrapper<TOrder> query = Wrappers.lambdaQuery();
         query.eq(TOrder::getSn,sn);
+        if(StringUtils.isEmpty(sn)){
+            return  "error";
+        }
         List<TOrder> list = orderService.list(query);
         TOrder order = list.get(0);
         if (order == null) {
@@ -3075,7 +3130,11 @@ public class TOrderController {
         int number = (int) num;
         LambdaQueryWrapper<TOrder> query = Wrappers.lambdaQuery();
         query.eq(TOrder::getSn,sn);
-        List<TOrder> list = orderService.list();
+        List<TOrder> list = new ArrayList<>();
+        if(StringUtils.isNotEmpty(sn)){
+            list = orderService.list(query);
+        }
+
         TOrder order = list.get(0);
         if (order.getStatus() != 0) {
             return "success";
@@ -3104,7 +3163,7 @@ public class TOrderController {
             }
 
             orderService.updateById(order);
-            TAdmin admin = R.getDataIfSuccess(szwlFeign.getAdmin(String.valueOf(order.getAdminId())));
+//            TAdmin admin = R.getDataIfSuccess(szwlFeign.getAdmin(String.valueOf(order.getAdminId())));
             JSONObject kindData = new JSONObject();
             kindData.put("sn", order.getSn());
             kindData.put("productName", order.getProductName());
@@ -3206,6 +3265,8 @@ public class TOrderController {
     @RequestMapping(value = "/deleteOrder", method = RequestMethod.GET)
     @ResponseBody
     public JsonMessage deleteOrder(String sn) {
+        if(StringUtils.isEmpty(sn)){
+            return JsonMessage.error(sn + "删除失败");        }
         LambdaQueryWrapper<TOrder> query = Wrappers.lambdaQuery();
         query.eq(TOrder::getSn,sn);
         List<TOrder> list = orderService.list(query);

src/main/java/com/szwl/model/entity/TEquipment.java

@@ -172,5 +172,6 @@ public class TEquipment implements Serializable {
     @ApiModelProperty(value = "设备类型，0：棉花糖，1，爆米花")
     private String machineType;
 
-
+    @ApiModelProperty(value = "apk版本;")
+    private String apkVersion;
 }

src/main/java/com/szwl/service/es/EsTCoinOrderService.java

@@ -87,6 +87,10 @@ public class EsTCoinOrderService extends EsBaseService<TCoinOrder, TCoinOrderPar
 //                    example.setOffset(offset);
 //                    List<TCoinOrder> list = tCoinOrderService.selectByOption(example);
                     LambdaQueryWrapper<TCoinOrder> query = Wrappers.lambdaQuery();
+                    SimpleDateFormat ft = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+                    String time = "2022-06-01 00:00:00";
+                    Date date = ft.parse(time);
+                    query.gt(TCoinOrder::getCreateDate,date);
                     Page<TCoinOrder> page = new Page<>(offset, limit, true);
                     IPage<TCoinOrder> iPage = tCoinOrderService.page(page, query);
                     List<TCoinOrder> list = iPage.getRecords();

src/main/java/com/szwl/service/es/EsTOrderService.java

@@ -103,6 +103,11 @@ public class EsTOrderService extends EsBaseService<TOrder, TOrderParam> {
 //                    example.setOffset(offset);
 //                    List<TOrder> list = tOrderService.selectByOption(example);
                     LambdaQueryWrapper<TOrder> query = Wrappers.lambdaQuery();
+                    SimpleDateFormat ft = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+                    String time = "2022-06-01 00:00:00";
+                    Date date = ft.parse(time);
+                    query.gt(TOrder::getCreateDate,date);
+                    query.ne(TOrder::getStatus,"0");
                     Page<TOrder> page = new Page<>(offset, limit, true);
                     IPage<TOrder> iPage = tOrderService.page(page, query);
                     List<TOrder> list = iPage.getRecords();

src/main/java/com/szwl/service/impl/TEquipmentServiceImpl.java

@@ -53,6 +53,7 @@ public class TEquipmentServiceImpl extends ServiceImpl<TEquipmentMapper, TEquipm
             messageProperties.setContentType("text/plain");
             org.springframework.amqp.core.Message message = new org.springframework.amqp.core.Message(json.getBytes(), messageProperties);
             amqpTemplate.send(equimentType, clientId, message);
+            System.out.println("mq发送成功，clientId="+clientId+"&json="+json);
         }
         return "success";
     }

src/main/resources/bootstrap.yml

@@ -3,7 +3,7 @@ spring:
     name: pay-server
   profiles:
     # 打包或运行时，换这里：sit测试，prod正式
-    active: prod
+    active: sit
   cloud:
     config:
       name: pay-server
@@ -36,7 +36,7 @@ spring:
   profiles: sit
   #数据库配置
   datasource:
-    url: jdbc:mysql://rm-wz995mu26a1479kz0so.mysql.rds.aliyuncs.com:3306/orderdb-test
+    url: jdbc:mysql://rm-wz995mu26a1479kz0so.mysql.rds.aliyuncs.com:3306/orderdb
     username: root
     password: sunzee@020
     driver-class-name: com.mysql.jdbc.Driver