Browse Source

feat:"修复提现回调接口,增加SBM10机型"

soobin 4 months ago
parent
commit
19822967d1

+ 6 - 4
src/main/java/com/szwl/controller/CallbackController.java

@@ -80,20 +80,22 @@ public class CallbackController {
                 return "";
             }
             JSONObject data = JSONObject.parseObject(respData);
-            String transStat = data.getString("trans_stat");
+            String transStatus = data.getString("trans_status");
             // 订单号
             String reqSeqId = data.getString("req_seq_id");
             String subRespCode = data.getString("sub_resp_code");
             LambdaQueryWrapper<WithdrawalRecord> query = Wrappers.lambdaQuery();
             query.eq(WithdrawalRecord::getOrderNo, reqSeqId);
             WithdrawalRecord withdrawalRecord = withdrawalRecordService.getOne(query);
-            withdrawalRecord.setStatus(2);
             if (HuifuConstant.RESP_CODE.equals(subRespCode)) {
                 // 业务处理成功
-                if (HuifuConstant.TRANS_STAT_S.equals(transStat) || HuifuConstant.TRANS_STAT_P.equals(transStat)) {
+                if (HuifuConstant.TRANS_STAT_S.equals(transStatus)) {
                     withdrawalRecord.setStatus(1);
-                } else {
+                } else if (HuifuConstant.TRANS_STAT_F.equals(transStatus)){
+                    withdrawalRecord.setStatus(2);
                     withdrawalRecord.setResultMsg(data.getString("sub_resp_desc"));
+                } else if (HuifuConstant.TRANS_STAT_P.equals(transStatus)) {
+                    withdrawalRecord.setStatus(0);
                 }
             } else {
                 // 业务处理失败

+ 4 - 0
src/main/java/com/szwl/controller/IndexController.java

@@ -33,6 +33,7 @@ import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.apache.commons.io.IOUtils;
 import org.apache.commons.lang.StringUtils;
+import org.apache.ibatis.annotations.Case;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
@@ -619,6 +620,9 @@ public class IndexController {
                                     case "P10":
                                         saveGoodsData(equipmentId, machineType, 2, equimentType);
                                         break;
+                                    case "SBM10":
+                                        saveGoodsData(equipmentId, machineType, 2, equimentType);
+                                        break;
                                     default:
                                         break;
                                 }

+ 3 - 0
src/main/java/com/szwl/controller/TEquipmentApplyController.java

@@ -301,6 +301,9 @@ public class TEquipmentApplyController {
                                 case "P10":
                                     saveGoodsData(equipmentId, machineType, 2, equipmentType);
                                     break;
+                                case "SBM10":
+                                    saveGoodsData(equipmentId, machineType, 2, equipmentType);
+                                    break;
                                 default:
                                     break;
                             }