Selaa lähdekoodia

修改消息推送单号回填缺少问题

xucaiqin 2 vuotta sitten
vanhempi
commit
a491afd2f4

+ 1 - 0
sckw-modules/sckw-payment/src/main/java/com/sckw/payment/service/KwpLedgerTradeService.java

@@ -241,6 +241,7 @@ public class KwpLedgerTradeService extends AbsLedger {
             KwpLedgerTrade ledgerTrade = tradeMapper.selectById(tradeSendReq.getId());
             orderCheck(ledgerTrade);
             updateCheck(ledgerTrade.getStatus());
+            kwpLedgerTrade.setTLedgerNo(ledgerTrade.getTLedgerNo());
             kwpLedgerTrade.setUpdateBy(LoginUserHolder.getUserId());
             kwpLedgerTrade.setUpdateTime(LocalDateTime.now());
             tradeMapper.updateById(kwpLedgerTrade);

+ 2 - 2
sckw-modules/sckw-payment/src/main/java/com/sckw/payment/service/KwpSettlementOfflineService.java

@@ -408,11 +408,11 @@ public class KwpSettlementOfflineService {
                 //推送双方系统管理员
                 messageSender.sendManager(LoginUserHolder.getUserId(), new HashMap<>() {{
                     put("company", kwpLedgerTradeUnit.getFirmName());
-                    put("number", kwpSettlementTrade.getStOrderNo());
+                    put("number", byId.getStOrderNo());
                 }}, kwpLedgerTradeUnit2.getEntId(), MessageEnum.SETTLEMENT_CONFIRM_SELL);
                 messageSender.sendManager(LoginUserHolder.getUserId(), new HashMap<>() {{
                     put("company", kwpLedgerTradeUnit2.getFirmName());
-                    put("number", kwpSettlementTrade.getStOrderNo());
+                    put("number", byId.getStOrderNo());
                 }}, kwpLedgerTradeUnit.getEntId(), MessageEnum.SETTLEMENT_CONFIRM_PURCHASE);
 
                 return "确认回款成功";

+ 2 - 2
sckw-modules/sckw-payment/src/main/java/com/sckw/payment/service/KwpSettlementWalletService.java

@@ -573,11 +573,11 @@ public class KwpSettlementWalletService {
                 //推送双方系统管理员
                 messageSender.sendManager(LoginUserHolder.getUserId(), new HashMap<>() {{
                     put("company", kwpLedgerTradeUnit.getFirmName());
-                    put("number", kwpSettlementTrade.getStOrderNo());
+                    put("number", byId.getStOrderNo());
                 }}, kwpLedgerTradeUnit2.getEntId(), MessageEnum.SETTLEMENT_CONFIRM_SELL);
                 messageSender.sendManager(LoginUserHolder.getUserId(), new HashMap<>() {{
                     put("company", kwpLedgerTradeUnit2.getFirmName());
-                    put("number", kwpSettlementTrade.getStOrderNo());
+                    put("number", byId.getStOrderNo());
                 }}, kwpLedgerTradeUnit.getEntId(), MessageEnum.SETTLEMENT_CONFIRM_PURCHASE);
 
                 //todo-xcq 调用中台接口

+ 2 - 2
sckw-modules/sckw-payment/src/main/resources/mapper/KwpSettlementTradeMapper.xml

@@ -359,8 +359,8 @@
     <select id="getById" resultType="com.sckw.payment.model.dto.SettlementTradeDto">
         select kst.id,
                kst.status,
-               kst.st_order_no,
-               kst.create_time,
+               kst.st_order_no                                    stOrderNo,
+               kst.create_time                                    createTime,
                kst.receipt_time,
                cast(kst.actual_price as char)                     actualPrice,
                cast(kst.total_price as char)                      totalPrice,