SXB023赋值修改

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

@@ -473,6 +473,7 @@ public class TbOrderService extends ServiceImpl<TbOrderMapper, TbOrder> implemen
         boolean update = super.updateById(tbOrder);
         // TODO: 2023/8/28 边民发起支付申请，调用银行接口：验证边民支付信息，将货款先存入银行第三方账户，并给出回执
         PaymentDto paymentDto = this.getPaymentData(tbOrder);
+        StaticLog.info("\nsendSXB010——PaymentDto——:{}",JSONUtil.toJsonStr(paymentDto));
         paymentServerInterface.sendSXB010(paymentDto);
 
        return update;
@@ -649,7 +650,7 @@ public class TbOrderService extends ServiceImpl<TbOrderMapper, TbOrder> implemen
             throw new ServiceException("当前订单状态已改变，不可做退款操作，请刷新后操作！");
 
         PaymentDto paymentDto = this.getPaymentData(order);
-        log.info("sendSXB013:{}",JSONUtil.toJsonStr(paymentDto));
+        StaticLog.info("\nsendSXB013(边民退货退款)——PaymentDto——:{}",JSONUtil.toJsonStr(paymentDto));
         paymentServerInterface.sendSXB013(paymentDto);
 
         LambdaUpdateWrapper<TbOrder> updateWrapper = new LambdaUpdateWrapper<>();
@@ -677,6 +678,7 @@ public class TbOrderService extends ServiceImpl<TbOrderMapper, TbOrder> implemen
         // TODO: 2023/11/27 查验不通过，车辆不通过卡3，调用银行退款划扣申请，从银行第三方账户，退回至边民借记卡账户
         tbOrderList.forEach(order -> {
             PaymentDto paymentDto = this.getPaymentData(order);
+            StaticLog.info("\nsendSXB013(进出口申报单退单)——PaymentDto——:{}",JSONUtil.toJsonStr(paymentDto));
             paymentServerInterface.sendSXB013(paymentDto);
         });
 
@@ -743,15 +745,19 @@ public class TbOrderService extends ServiceImpl<TbOrderMapper, TbOrder> implemen
             paymentDto.setTradeNo(tbOrder.getTradeNo());
             paymentDto.setDeclTime(htPassCardDTO.getCheckTime());
             paymentDto.setFieldCode(area.getCode());
+            StaticLog.info("\nsendCXB001——PaymentDto——:{}",JSONUtil.toJsonStr(paymentDto));
             paymentServerInterface.sendCXB001(paymentDto);
         }
         //this.updateBatchById(tbOrders);
 
 
         //todo: 调用银行接口发起划扣：将边民划扣至银行第三方账户的货款，支付至外籍商户的账户
-        PaymentDto paymentDto2 = this.getPaymentData(tbOrders.get(0));
+        PaymentDto paymentDto2 = new PaymentDto();
         paymentDto2.setTradeNos(tradeNos);
-        log.info("sendSXB023:{}",JSONUtil.toJsonStr(paymentDto2));
+        paymentDto2.setVoyageNo(htPassCardDTO.getManifestId());
+        paymentDto2.setVeNo(tbOrders.get(0).getVeNo());
+        paymentDto2.setFieldCode(area.getCode());
+        StaticLog.info("\nsendSXB023——PaymentDto——:{}",JSONUtil.toJsonStr(paymentDto2));
         paymentServerInterface.sendSXB023(paymentDto2);
 
         return true;