liujunchi 2 سال پیش
والد
کامیت
307d75cdfa

+ 7 - 0
cooleshow-mall/mall-portal/src/main/java/com/yonge/cooleshow/portal/controller/PaymentController.java

@@ -31,6 +31,7 @@ import org.redisson.api.RedissonClient;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
 import org.springframework.http.HttpStatus;
 import org.springframework.web.bind.annotation.*;
 
@@ -68,6 +69,9 @@ public class PaymentController extends BaseController {
     @Autowired
     private RedissonClient redissonClient;
 
+    @Value("${message.debugMode}")
+    private boolean debugMode;
+
     @ApiOperation(value = "订单付款")
     @PostMapping("/orderPay")
     public HttpResponseResult<OrderPayRes> orderPay(@Valid @RequestBody OrderPayReq payReq, HttpServletRequest request) {
@@ -144,6 +148,9 @@ public class PaymentController extends BaseController {
             @PathVariable("payMethod") String payMethod,
             HttpServletRequest request
     ) {
+        if (debugMode) {
+            return null;
+        }
         BaseResult<PaymentCallBack> res = paymentClient.analysisNotice(
                 OpenEnum.valueOf(openType), PaymentClientEnum.valueOf(client),
                 PayChannelEnum.valueOf(payChannel), MethodNameEnum.valueOf(payMethod), request);

+ 3 - 0
cooleshow-user/user-admin/src/main/java/com/yonge/cooleshow/admin/controller/open/UserOrderClient.java

@@ -87,6 +87,9 @@ public class UserOrderClient extends BaseController {
             @PathVariable("payMethod") String payMethod,
             HttpServletRequest request
     ) {
+        if (debugMode) {
+            return null;
+        }
         //支付回调:openType is ORIGINAL ,paymentClient is STUDENT,payChannel is ali_app,payMethod is executePayment
         log.info("支付回调:openType is {} ,paymentClient is {},payChannel is {},payMethod is {}", openType, client, payChannel, payMethod);
         BaseResult<PaymentCallBack> res = paymentClient.analysisNotice(

+ 3 - 3
service.md

@@ -1,8 +1,8 @@
 - [ ] gateway-server
 - [ ] auth-server
 - [x] admin-server
-- [x] teacher-server
-- [x] student-server
+- [ ] teacher-server
+- [ ] student-server
 - [ ] website-server
 - [ ] task-server
 - [ ] websocket-server
@@ -11,5 +11,5 @@
 - [ ] classroom-server
 - [ ] cms-server
 - [ ] mall-admin
-- [ ] mall-server
+- [x] mall-server
 - [ ] EOF