Merge branch 'feature/asyncOrder' of http://git.aseanbusiness.cn/qzyReal/market-server into feature/asyncOrder

sp-service/async-server/src/main/java/com/pj/feign/AmqpTemplateFeign.java

@@ -55,12 +55,12 @@ public class AmqpTemplateFeign {
         String msgTime = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(new Date());
         dataDto.setMsgTime(msgTime);
         //sign
-        String signString = "msgId=" + msgId + "&appId=" + appId + "&dataType=" + dataType + "&msgTime=" + msgTime + "&data=" + encryptCBC;
+        String signString = "msgId=" + msgId + "&appId=" + appId + "&dataType=" + dataType + "&msgTime=" + msgTime + "&data=" + encryptCBC + "&" + RabbitMQ.ACC_KEY;
         String sign = MD5.getMd5(signString, 32);
         dataDto.setSign(sign);
-
         //mq发送信息
         amqpTemplate.convertAndSend(RabbitMQ.TEST_SEND_QUEUE, dataDto);
+        log.info("send mq msg finish:{},{}", dataType,JSON.toJSONString(dataDto));
         log.info("send mq msg finish:{},{}", dataType,JSON.toJSONString(t));
     }
 

sp-service/async-server/src/main/java/com/pj/listen/BaseInfoListen.java

@@ -51,7 +51,7 @@ public class BaseInfoListen {
      * 测试接收
      * 测试已通过
      */
-    @RabbitListener(queuesToDeclare = @Queue(RabbitMQ.TEST_SEND_QUEUE))
+    /*@RabbitListener(queuesToDeclare = @Queue(RabbitMQ.TEST_SEND_QUEUE))
     public void sendMessage(Message dataDto1){
         System.out.println("\n测试:接收信息\n");
         byte[] body = dataDto1.getBody();
@@ -60,6 +60,6 @@ public class BaseInfoListen {
         String cbc = AESUtil.decryptCBC(dataDto.getData(), RabbitMQ.ACC_KEY);
         OrderDto orderDto = JSONObject.parseObject(cbc, OrderDto.class);
         System.out.println("\n" + orderDto.toString() + "\n");
-    }
+    }*/
 
 }

sp-service/async-server/src/main/java/com/pj/task/HtByteTask.java

@@ -211,10 +211,8 @@ public class HtByteTask {
                 case "007":
                     //放行记录（过卡记录）
                     HtPassCardDTO htPassCardDTO = JSONObject.parseObject(body, HtPassCardDTO.class);
-                    //{"msgId":"987578382983278592","appId":"shop01","dataType":"007","msgTime":"2024-08-25 14:50:45","sign":"23370a204e1fa1c2a1c5a27f78947d52",
-                    // "data":"zo5yvhKGlGI4DFIbdwOa2eDjupWkiKvfWDGdNIbpX3WbDq4LsUhnTYh6aLPdj+w4l6OmVzLEjgh2/FC8MVmkYqCT6MZ401A8I8h7JYNXr+Gh5kU3vUCNEdOdxC8PcOKQKEBya4oggQjnC2cP2V39am9gCpCQ49rq76pcQh4+igji79vxJ7mISJ+iup/bY5Ps3EhTw2UC16cvnnt+ZHoM12Jz0JhnCMS9yvI1gPSx+vguo456ZIuuMaWLDiKU5TP5bXWJFyU3/XL7dgK9V5AGSg/nM3bHfiDyLLrREeeDt/ODQ4wUrjgVYLuNMSSJ543cCTrsDLc6+78VfoYhq7KxJXFb3DPV3vfxGKq9D5ymuViSBewscq7QFJumeEI5VExO"}
                     //系统接收到航通过卡记录且卡口类型为'3卡'：车辆已出一级市场, 修改相对应的一级市场订单状态
-                    if ("3卡".equals(htPassCardDTO.getChannelType())|| StrUtil.contains(htPassCardDTO.getChannelNo(),"3")) {
+                    if ("3卡".equals(htPassCardDTO.getChannelType())|| StrUtil.contains(htPassCardDTO.getChannelName(),"三卡")) {
                         flag = FeignFactory.levelOneServerInterface.orderFinish(htPassCardDTO);
                         methodHtByteTask.updateHtByteInfo(flag, item, dataDto);
                         if (flag) {

sp-service/level-one-server/src/main/java/com/pj/tb_order/TbOrderService.java

@@ -510,16 +510,6 @@ public class TbOrderService extends ServiceImpl<TbOrderMapper, TbOrder> implemen
         } else if (1 == SXB010Status) {//扣款成功
             tbOrder.setSxb010Status(1)
                     .setSxb010StatusTime(new Date());
-
-            /*tbOrder.setPeopleConfirmTime(new Date())
-                    .setPeopleConfirmStatus(ConfirmStatus.CONFIRM_STATUS_ONE.getCode())
-                    .setUpdateTime(new Date());*/
-            if ("1".equals(tbOrder.getDeclareType())) {
-                // TODO: 2023/8/29 调用航通009接口，发送信息
-                sendConfirmMsgToHt(tbOrder);
-                //当declareType为边民时，不需要走后续两个确认，订单状态改为已完成
-                //tbOrder.setFinishStatus(FinishStatus.FINISH_STATUS_ONE.getCode());
-            }
         }
 
         return super.updateById(tbOrder);
@@ -576,8 +566,7 @@ public class TbOrderService extends ServiceImpl<TbOrderMapper, TbOrder> implemen
         wrapper.eq(TbOrder::getId, orderId);
         boolean result = update(wrapper);
 
-        if (result && !"1".equals(tbOrder.getDeclareType())
-                && tbOrder.getPeopleConfirmStatus() == 1 && tbOrder.getCooperEntrustStatus() == 1) {
+        if (result && tbOrder.getPeopleConfirmStatus() == 1) {
             // TODO: 2023/8/29 调用航通009接口，发送信息
             sendConfirmMsgToHt(tbOrder);
         }
@@ -594,6 +583,7 @@ public class TbOrderService extends ServiceImpl<TbOrderMapper, TbOrder> implemen
         peopleConfirmDTO.setIdno(tbPeople.getIdCard());
         peopleConfirmDTO.setSettleBillNo(tbOrder.getSettleBillNo());
         peopleConfirmDTO.setPreIeportNo(tbOrder.getPreIeportNo());
+        peopleConfirmDTO.setBorderPutrecNo(tbOrder.getBorderPutrecNo());
         log.info("sendConfirmMsgToHt:{}", JSONUtil.toJsonStr(peopleConfirmDTO));
         FeignFactory.asyncServerInterface.sendConfirm(peopleConfirmDTO);
     }
@@ -779,7 +769,7 @@ public class TbOrderService extends ServiceImpl<TbOrderMapper, TbOrder> implemen
         }
         this.updateBatchById(tbOrders);
 
-
+        tradeNos = StringUtils.removeEnd(tradeNos, ",");
         //todo: 调用银行接口发起划扣：将边民划扣至银行第三方账户的货款，支付至外籍商户的账户
         PaymentDto paymentDto2 = new PaymentDto();
         paymentDto2.setTradeNos(tradeNos);