he2802 1 年間 前
コミット
42eff41956

+ 2 - 2
zhongzheng-api/src/main/java/com/zhongzheng/controller/order/OrderHandleController.java

@@ -118,8 +118,8 @@ public class OrderHandleController extends BaseController {
 
     @ApiOperation("经办订单继续支付")
     @PreAuthorize("@ss.hasPermi('system:handle:list')")
-    @GetMapping("/resumePay")
-    public AjaxResult<Map<String, String>> resumePay(OrderHandleAddBo bo) {
+    @PostMapping("/resumePay")
+    public AjaxResult<Map<String, String>> resumePay(@RequestBody OrderHandleAddBo bo) {
         ClientLoginUser loginUser = wxTokenService.getLoginUser(ServletUtils.getRequest());
         bo.setCreateUserId(loginUser.getUser().getUserId());
         return AjaxResult.success("支付结果",iOrderHandleService.resumePayOrder(bo));

+ 12 - 2
zhongzheng-system/src/main/java/com/zhongzheng/modules/order/service/impl/OrderHandleServiceImpl.java

@@ -153,6 +153,17 @@ public class OrderHandleServiceImpl extends ServiceImpl<OrderHandleMapper, Order
             addBo.setHandleOrderSn(handleOrderSn);
             iOrderService.placePlatHandleOrder(addBo);
         }
+        OrderHandle orderHandle = queryBySn(bo.getHandleOrderSn());
+        if(orderHandle.getPayPrice().compareTo(BigDecimal.ZERO) == 0) {
+            LambdaUpdateWrapper<OrderHandle> objectLambdaUpdateWrapper = Wrappers.lambdaUpdate();
+            objectLambdaUpdateWrapper.eq(OrderHandle::getId, orderHandle.getId());
+            objectLambdaUpdateWrapper.set(OrderHandle::getUpdateTime,DateUtils.getNowTime());
+            objectLambdaUpdateWrapper.set(OrderHandle::getPayTime,DateUtils.getNowTime());
+            objectLambdaUpdateWrapper.set(OrderHandle::getPayStatus,1);
+            objectLambdaUpdateWrapper.set(OrderHandle::getPayType,1);
+            this.update(null, objectLambdaUpdateWrapper);
+        }
+
         return handleOrderSn;
     }
 
@@ -177,7 +188,7 @@ public class OrderHandleServiceImpl extends ServiceImpl<OrderHandleMapper, Order
         UserVo userVo = iUserService.queryById(bo.getCreateUserId());
         if(bo.getPayType()==1){
             Map<String, String> payResult = new HashMap<>();
-            if (orderHandle.getPayPrice().compareTo(BigDecimal.ZERO) != 0) {
+            if(orderHandle.getPayPrice().compareTo(BigDecimal.ZERO) != 0) {
                 OrderPayAddBo payAddBo = new OrderPayAddBo();
                 //生成支付单号
                 String pay_no = DateUtils.getPayOrderSn();
@@ -188,7 +199,6 @@ public class OrderHandleServiceImpl extends ServiceImpl<OrderHandleMapper, Order
                 payAddBo.setOrderFrom(2);
                 iOrderPayService.insertByAddBo(payAddBo);
                 String body = "中正云-订单:"+orderHandle.getHandleOrderSn();
-                System.out.println(orderHandle.getPayPrice());
                 payResult = iWxPayService.paymentPc(pay_no, userVo.getOpenId(), body, orderHandle.getPayPrice());
                 payResult.put("orderSn", orderHandle.getHandleOrderSn());
                 return payResult;