Bläddra i källkod

update 无现金支付加上返回内容

周箭河 4 år sedan
förälder
incheckning
1854b28486

+ 2 - 2
mec-biz/src/main/java/com/ym/mec/biz/service/impl/DegreeRegistrationServiceImpl.java

@@ -315,7 +315,7 @@ public class DegreeRegistrationServiceImpl extends BaseServiceImpl<Integer, Degr
             notifyMap.put("channelType", channelType);
             notifyMap.put("channelType", channelType);
             notifyMap.put("orderNo", "");
             notifyMap.put("orderNo", "");
             studentPaymentOrderService.updateOrder(notifyMap);
             studentPaymentOrderService.updateOrder(notifyMap);
-            return BaseController.failed(HttpStatus.CREATED, "恭喜您,支付成功!");
+            return BaseController.failed(HttpStatus.CREATED, notifyMap,"恭喜您,支付成功!");
         }
         }
 
 
         String baseApiUrl = sysConfigDao.findConfigValue("base_api_url");
         String baseApiUrl = sysConfigDao.findConfigValue("base_api_url");
@@ -511,7 +511,7 @@ public class DegreeRegistrationServiceImpl extends BaseServiceImpl<Integer, Degr
             notifyMap.put("channelType", channelType);
             notifyMap.put("channelType", channelType);
             notifyMap.put("orderNo", "");
             notifyMap.put("orderNo", "");
             studentPaymentOrderService.updateOrder(notifyMap);
             studentPaymentOrderService.updateOrder(notifyMap);
-            return BaseController.failed(HttpStatus.CREATED, "恭喜您,支付成功!");
+            return BaseController.failed(HttpStatus.CREATED, notifyMap,"恭喜您,支付成功!");
         }
         }
 
 
         String baseApiUrl = sysConfigDao.findConfigValue("base_api_url");
         String baseApiUrl = sysConfigDao.findConfigValue("base_api_url");

+ 3 - 3
mec-student/src/main/java/com/ym/mec/student/controller/MusicGroupController.java

@@ -230,7 +230,7 @@ public class MusicGroupController extends BaseController {
             throw new BizException("缴费暂未开始,如有问题请联系指导老师");
             throw new BizException("缴费暂未开始,如有问题请联系指导老师");
         }
         }
         if (renew.containsKey("tradeState")) {
         if (renew.containsKey("tradeState")) {
-            return failed(HttpStatus.CREATED, "恭喜您,缴费成功!");
+            return failed(HttpStatus.CREATED, renew,"恭喜您,缴费成功!");
         }
         }
         return succeed(renew);
         return succeed(renew);
     }
     }
@@ -299,7 +299,7 @@ public class MusicGroupController extends BaseController {
         }
         }
         Map payMap = musicGroupService.pay(registerPayDto);
         Map payMap = musicGroupService.pay(registerPayDto);
         if (payMap.containsKey("tradeState")) {
         if (payMap.containsKey("tradeState")) {
-            return failed(HttpStatus.CREATED, "恭喜您,报名成功!");
+            return failed(HttpStatus.CREATED, payMap,"恭喜您,报名成功!");
         }
         }
         return succeed(payMap);
         return succeed(payMap);
     }
     }
@@ -325,7 +325,7 @@ public class MusicGroupController extends BaseController {
         }
         }
         Map payMap = musicGroupService.rePay(registerPayDto);
         Map payMap = musicGroupService.rePay(registerPayDto);
         if (payMap.containsKey("tradeState")) {
         if (payMap.containsKey("tradeState")) {
-            return failed(HttpStatus.CREATED, "恭喜您,报名成功!");
+            return failed(HttpStatus.CREATED, payMap,"恭喜您,报名成功!");
         }
         }
         return succeed(payMap);
         return succeed(payMap);
     }
     }

+ 2 - 2
mec-student/src/main/java/com/ym/mec/student/controller/RepairController.java

@@ -74,7 +74,7 @@ public class RepairController extends BaseController {
         studentGoodsSell.setAuthorUser(studentGoodsSell.getUserId());
         studentGoodsSell.setAuthorUser(studentGoodsSell.getUserId());
         Map map = studentRepairService.addGoodsSellOrder(studentGoodsSell);
         Map map = studentRepairService.addGoodsSellOrder(studentGoodsSell);
         if(map.containsKey("tradeState")){
         if(map.containsKey("tradeState")){
-            return failed(HttpStatus.CREATED, "恭喜您,购买成功!");
+            return failed(HttpStatus.CREATED, map,"恭喜您,购买成功!");
         }
         }
         return succeed(map);
         return succeed(map);
     }
     }
@@ -84,7 +84,7 @@ public class RepairController extends BaseController {
     public HttpResponseResult studentPaymentGoodsOrder(Integer goodsSellId) throws Exception {
     public HttpResponseResult studentPaymentGoodsOrder(Integer goodsSellId) throws Exception {
         Map map = studentRepairService.studentPaymentGoodsOrder(goodsSellId);
         Map map = studentRepairService.studentPaymentGoodsOrder(goodsSellId);
         if(map.containsKey("tradeState")){
         if(map.containsKey("tradeState")){
-            return failed(HttpStatus.CREATED, "恭喜您,购买成功!");
+            return failed(HttpStatus.CREATED, map,"恭喜您,购买成功!");
         }
         }
         return succeed(map);
         return succeed(map);
     }
     }

+ 2 - 2
mec-student/src/main/java/com/ym/mec/student/controller/SporadicChargeInfoController.java

@@ -78,7 +78,7 @@ public class SporadicChargeInfoController extends BaseController {
                 try {
                 try {
                     Map payMap = musicGroupService.sporadicPay(sporadicPayDto);
                     Map payMap = musicGroupService.sporadicPay(sporadicPayDto);
                     if (payMap.containsKey("tradeState")) {
                     if (payMap.containsKey("tradeState")) {
-                        return failed(HttpStatus.CREATED, "恭喜您,支付成功!");
+                        return failed(HttpStatus.CREATED, payMap,"恭喜您,支付成功!");
                     }
                     }
                     return succeed(payMap);
                     return succeed(payMap);
                 } catch (Exception e) {
                 } catch (Exception e) {
@@ -97,7 +97,7 @@ public class SporadicChargeInfoController extends BaseController {
 
 
         Map payMap = musicGroupService.sporadicPay(sporadicPayDto);
         Map payMap = musicGroupService.sporadicPay(sporadicPayDto);
         if (payMap.containsKey("tradeState")) {
         if (payMap.containsKey("tradeState")) {
-            return failed(HttpStatus.CREATED, "恭喜您,支付成功!");
+            return failed(HttpStatus.CREATED, payMap,"恭喜您,支付成功!");
         }
         }
         return succeed(payMap);
         return succeed(payMap);
     }
     }

+ 1 - 1
mec-web/src/main/java/com/ym/mec/web/controller/education/EduRepairController.java

@@ -95,7 +95,7 @@ public class EduRepairController extends BaseController {
         studentGoodsSell.setAuthorUser(sysUser.getId());
         studentGoodsSell.setAuthorUser(sysUser.getId());
         Map map = studentRepairService.addGoodsSellOrder(studentGoodsSell);
         Map map = studentRepairService.addGoodsSellOrder(studentGoodsSell);
         if(map.containsKey("tradeState")){
         if(map.containsKey("tradeState")){
-            return failed(HttpStatus.CREATED, "恭喜您,购买成功!");
+            return failed(HttpStatus.CREATED, map,"恭喜您,购买成功!");
         }
         }
         return succeed(map);
         return succeed(map);
     }
     }