diff --git a/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/royalcanin/good/OrderController.java b/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/royalcanin/good/OrderController.java index 4799c05e..d5a40337 100644 --- a/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/royalcanin/good/OrderController.java +++ b/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/royalcanin/good/OrderController.java @@ -85,7 +85,7 @@ public class OrderController { total_fee = total_fee + orderService.couponTotal(ordersEntitys.getCouponTypeId(),Double.parseDouble(ordersEntitys.getCouponAmount()),Double.parseDouble(ordersEntitys.getPayAmount()),ordersEntitys.getBuyCount()); memberId = ordersEntitys.getMemberId(); mobile = ordersEntitys.getPhoneNumber(); - buyCount = buyCount + ordersEntitys.getBuyCount(); + buyCount = buyCount + ordersEntitys.getBuyCount();1 } ordersEntity.setOrderAddress(orderAddress); ordersEntity.setProductCode(productId.substring(0,productId.length()-1)); @@ -175,12 +175,12 @@ public class OrderController { } @PostMapping("royalcanin/updateOrderAliPay") - public String alipayNotify(HttpServletRequest request) throws Exception { + public ResponseDTO alipayNotify(HttpServletRequest request) throws Exception { // 获取支付宝的请求信息 Map map = new HashMap<>(); Map requestParams = request.getParameterMap(); if(requestParams.isEmpty()) { - return "failure"; + return ResponseDTO.wrap(OrderResponseCodeConst.WITHOUT_ORDER); } // 将 Map 转为 Map for (Iterator iter = requestParams.keySet().iterator(); iter.hasNext();) { @@ -197,8 +197,10 @@ public class OrderController { // 验签通过 if (signVerified) { //支付成功后进行操作 + aliPayService.orderCallBackAliPay(map.get("out_trade_no"),map.get("total_amount")); + return ResponseDTO.succ(); } - return "failure"; + return ResponseDTO.wrap(OrderResponseCodeConst.WITHOUT_ORDER); }