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

mec-student/src/main/java/com/ym/mec/student/controller/ReplacementInstrumentActivityController.java

@@ -20,6 +20,8 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.HttpStatus;
 import org.springframework.web.bind.annotation.*;
 
+import java.util.Map;
+
 @RequestMapping("replacementInstrumentActivity")
 @Api(tags = "乐器置换调查问卷")
 @RestController
@@ -162,6 +164,10 @@ public class ReplacementInstrumentActivityController extends BaseController {
         if (replacementInstrumentActivity.getPayStatus().equals(1) && !replacementPayDto.getRePay()) {
             return failed(HttpStatus.CONTINUE, "您有待支付的订单");
         }
+        Map payMap = replacementInstrumentActivityService.pay(replacementPayDto);
+        if (payMap.containsKey("tradeState")) {
+            return failed(HttpStatus.CREATED, payMap, "恭喜您,支付成功!");
+        }
         return succeed(replacementInstrumentActivityService.pay(replacementPayDto));
     }
 }

mec-student/src/main/java/com/ym/mec/student/controller/StudentInstrumentController.java

@@ -54,7 +54,7 @@ public class StudentInstrumentController extends BaseController {
     public HttpResponseResult pay(MaintenancePayDto maintenancePayDto) throws Exception {
         Map payMap = studentInstrumentService.pay(maintenancePayDto);
         if (payMap.containsKey("tradeState")) {
-            return failed(HttpStatus.CREATED, payMap, "恭喜您,报名成功!");
+            return failed(HttpStatus.CREATED, payMap, "恭喜您,支付成功!");
         }
         return succeed(payMap);
     }