线下支付优化

yshop-drink-boot3/yshop-module-mall/yshop-module-order-api/src/main/java/co/yixiang/yshop/module/order/enums/PayTypeEnum.java

@@ -18,6 +18,7 @@ import java.util.stream.Stream;
 @AllArgsConstructor
 public enum PayTypeEnum {
 
+	CASH("cash","现金支付"),
 	ALI("alipay","支付宝支付"),
 	WEIXIN("weixin","微信支付"),
 	YUE("yue","余额支付"),

yshop-drink-boot3/yshop-module-mall/yshop-module-order-biz/src/main/java/co/yixiang/yshop/module/order/service/storeorder/AppStoreOrderServiceImpl.java

@@ -521,6 +521,8 @@ public class AppStoreOrderServiceImpl extends ServiceImpl<StoreOrderMapper,Store
             payTypeMsg = PayTypeEnum.YUE.getDesc();
         }else if (PayTypeEnum.ALI.getValue().equals(payType)) {
             payTypeMsg = PayTypeEnum.ALI.getDesc();
+        }else if(PayTypeEnum.CASH.getValue().equals(payType)){
+            payTypeMsg = PayTypeEnum.CASH.getDesc();
         }
         billService.expend(userInfo.getId(), "购买商品",
                 BillDetailEnum.CATEGORY_1.getValue(),

yshop-drink-boot3/yshop-module-mall/yshop-module-order-biz/src/main/java/co/yixiang/yshop/module/order/service/storeorder/StoreOrderServiceImpl.java

@@ -190,13 +190,8 @@ public class StoreOrderServiceImpl implements StoreOrderService {
         // 校验存在
         validateStoreOrderExists(id);
         StoreOrderDO storeOrderDO = storeOrderMapper.selectById(id);
-        storeOrderDO.setPaid(OrderInfoEnum.PAY_STATUS_1.getValue());
-        storeOrderDO.setPayTime(LocalDateTime.now());
-        storeOrderMapper.updateById(storeOrderDO);
-
-        //增加状态
-        storeOrderStatusService.create(storeOrderDO.getUid(),storeOrderDO.getId(), OrderLogEnum.OFFLINE_PAY.getValue(),
-                OrderLogEnum.OFFLINE_PAY.getDesc());
+        //下线支付
+        appStoreOrderService.paySuccess(storeOrderDO.getOrderId(),PayTypeEnum.CASH.getValue());
     }
 
     @Override