支付订单状态更新

yiqi-core/src/main/java/com/yiqi/order/service/impl/OrderClothServiceImpl.java

@@ -164,11 +164,18 @@ public class OrderClothServiceImpl extends ServiceImpl<OrderClothMapper, OrderCl
                 && !ClothOrderStatusType.CANCEL.getCode().equals(orderCloth.getOrderStatus())) {
             return R.fail("订单状态不正确，无法支付执行支付成功操作");
         }
+        return paySuccess(orderCloth);
+    }
+
+    public R paySuccess(OrderCloth orderCloth) {
+        //查询订单
         if (ClothOrderPayTimeType.take_cloth_pay.getCode().equals(orderCloth.getPayTimeType())) {//收衣付款
-            orderCloth.setOrderStatus(ClothOrderStatusType.WASHING.getCode());
+            orderCloth.setOrderStatus(ClothOrderStatusType.WAIT_FACTORY.getCode());
         } else {//取衣付款
             orderCloth.setOrderStatus(ClothOrderStatusType.HAS_WASH.getCode());
         }
+        orderCloth.setPayStatus(PayStatus.HAS_PAY.getCode());
+        orderCloth.setPayTime(DateUtils.getNowDate());
         updateById(orderCloth);
         return R.ok();
     }
@@ -482,11 +489,7 @@ public class OrderClothServiceImpl extends ServiceImpl<OrderClothMapper, OrderCl
         }
         if (orderClothPayDTO.getPayType().equals(PayType.CASH.getCode())) {
             orderCloth.setPayType(PayType.CASH.getCode());
-            if (orderCloth.getOrderStatus().equals(ClothOrderStatusType.WAITING_FOR_PAY.getCode())) {
-                orderCloth.setOrderStatus(ClothOrderStatusType.WASHING.getCode());
-            }
-            orderCloth.setPayStatus(PayStatus.HAS_PAY.getCode());
-            this.updateById(orderCloth);
+            paySuccess(orderCloth);
             return OrderPayResultVO.paySuccess(orderCloth.getOrderNo());
         }
         if (orderClothPayDTO.getPayType().equals(PayType.WECHAT.getCode())) {
@@ -509,8 +512,7 @@ public class OrderClothServiceImpl extends ServiceImpl<OrderClothMapper, OrderCl
 
                 PayResponseDTO payResponseDTO = payService.faceToFacePay(PayOrderFaceToFaceDTO.createRechargeOrderPayData(orderPayInfo.getPayOrderNo(), orderPayInfo.getPayAmount(), orderPayInfo.getPayType(), orderClothPayDTO.getAuthCode()));
                 if (payResponseDTO.getPayResult().equals(PayResult.success.getCode())) {
-                    orderCloth.setPayStatus(PayStatus.HAS_PAY.getCode());
-                    this.updateById(orderCloth);
+                    paySuccess(orderCloth);
                     delayQueueCache.deleteDelayJob(orderPayInfo.getPayOrderNo());
                     return OrderPayResultVO.paySuccess(orderCloth.getOrderNo());
                 } else if (payResponseDTO.getPayResult().equals(PayResult.fail.getCode())) {
@@ -532,8 +534,7 @@ public class OrderClothServiceImpl extends ServiceImpl<OrderClothMapper, OrderCl
             orderCloth.setPayType(PayType.BALANCE.getCode());
             RechargeCardPayDTO rechargeCardPayDTO = new RechargeCardPayDTO(orderCloth.getAppUserId(), orderCloth.getOrgId(), orderCloth.getOrderNo(), orderCloth.getPayAmount(), OrderType.cloth.getCode());
             rechargePasswordCardService.orderPayByBalance(rechargeCardPayDTO);
-            orderCloth.setPayStatus(PayStatus.HAS_PAY.getCode());
-            this.updateById(orderCloth);
+            paySuccess(orderCloth);
             return OrderPayResultVO.paySuccess(orderCloth.getOrderNo());
         }
         return OrderPayResultVO.payError("请重新支付");