修改扫呗回调接口

share-system/src/main/java/share/system/domain/EquityMembersOrder.java

@@ -59,13 +59,13 @@ public class EquityMembersOrder extends BaseEntity {
     private Integer payType;
 
     /**
-     * 商户订单号
+     * 商户平台唯一订单号
      */
-    @Excel(name = "商户订单号")
+    @Excel(name = "商户平台唯一订单号")
     private String outTradeNo;
 
     /**
-     * 商户订单号
+     * 终端流水号
      */
     @Excel(name = "终端流水号")
     private String terminalTrace;

share-system/src/main/java/share/system/service/impl/CallbackServiceImpl.java

@@ -382,7 +382,7 @@ public class CallbackServiceImpl implements CallbackService {
                     break;
                 case RECHARGE:
                     Recharge rechargeParam = new Recharge();
-                    rechargeParam.setOutTradeNo(param.getTerminal_trace());
+                    rechargeParam.setTerminalTrace(param.getTerminal_trace());
                     rechargeParam.setConsumerId(attachVo.getUserId());
 
                     Recharge recharge = rechargeService.getInfoByEntity(rechargeParam);
@@ -410,7 +410,7 @@ public class CallbackServiceImpl implements CallbackService {
                         saobeiApiLogService.insertSaobeiApiLog(saobeiApiLog);
                         return responseVo;
                     }
-                    WechatPayInfo wechatInfo = wechatPayInfoService.getByNo(recharge.getOutTradeNo());
+                    WechatPayInfo wechatInfo = wechatPayInfoService.getByNo(recharge.getTerminalTrace());
                     if (ObjectUtil.isNull(wechatInfo)) {
                         logger.error("saobei wechat pay error : 微信订单信息不存在==》" + param.getTerminal_trace());
                         responseVo.setReturn_code(SaobeiStatusEnum.FAIL.getCode());
@@ -459,7 +459,7 @@ public class CallbackServiceImpl implements CallbackService {
                     break;
                 case RIGHTS:
                     EquityMembersOrder equityMembersOrderParam = new EquityMembersOrder();
-                    equityMembersOrderParam.setOutTradeNo(param.getTerminal_trace());
+                    equityMembersOrderParam.setTerminalTrace(param.getTerminal_trace());
                     equityMembersOrderParam.setConsumerId(attachVo.getUserId());
 
                     EquityMembersOrder equityMembersOrder = equityMembersOrderService.getInfoByEntity(equityMembersOrderParam);
@@ -487,7 +487,7 @@ public class CallbackServiceImpl implements CallbackService {
                         saobeiApiLogService.insertSaobeiApiLog(saobeiApiLog);
                         return responseVo;
                     }
-                    WechatPayInfo equityPayInfo = wechatPayInfoService.getByNo(equityMembersOrder.getOutTradeNo());
+                    WechatPayInfo equityPayInfo = wechatPayInfoService.getByNo(equityMembersOrder.getTerminalTrace());
                     if (ObjectUtil.isNull(equityPayInfo)) {
                         logger.error("saobei wechat pay error : 微信订单信息不存在==》" + param.getTerminal_trace());
                         responseVo.setReturn_code(SaobeiStatusEnum.FAIL.getCode());