feat:下单bug

2025-01-08 18:08:24 +08:00
1 parent 273d753211
commit bd69bf6e71
@@ -1,9 +1,8 @@
 package com.bsd.pjcloud.hard.api.dto.order.app;

-import com.bsd.pjcloud.hard.api.constant.HardTypeEnum;
 import com.bsd.pjcloud.hard.api.constant.order.HardOrderTypeEnum;
 import com.bsd.pjcloud.hard.api.constant.order.HardPayTypeEnum;
-import com.bsd.pjcloud.wallet.api.constant.WalletTypeCodeEnum;
+import com.bsd.pjcloud.wallet.api.constant.WalletTypeEnum;
 import jakarta.validation.constraints.NotNull;
 import lombok.AllArgsConstructor;
 import lombok.Builder;
@@ -23,7 +22,7 @@ public class HardAppCreateOrderDto {
    private Long userId;

    @NotNull(message = "钱包类型不能为空")
-    private WalletTypeCodeEnum walletType;
+    private WalletTypeEnum walletType;

    @NotNull(message = "订单类型不能为空")
    private HardOrderTypeEnum orderType;
@@ -12,12 +12,11 @@ import com.bsd.pjcloud.common.security.service.PjcloudUser;
 import com.bsd.pjcloud.common.security.util.SecurityUtils;
 import com.bsd.pjcloud.hard.api.constant.order.HardOrderTypeEnum;
 import com.bsd.pjcloud.hard.api.constant.order.HardPayTypeEnum;
-import com.bsd.pjcloud.hard.api.dto.hard.HardCreateOrderDto;
 import com.bsd.pjcloud.hard.api.dto.order.HardOrderDto;
 import com.bsd.pjcloud.hard.api.dto.order.app.HardAppCreateOrderDto;
 import com.bsd.pjcloud.hard.api.entity.order.HardOrderEntity;
 import com.bsd.pjcloud.hard.service.HardOrderService;
-import com.bsd.pjcloud.wallet.api.constant.WalletTypeCodeEnum;
+import com.bsd.pjcloud.wallet.api.constant.WalletTypeEnum;
 import org.springframework.security.access.prepost.PreAuthorize;
 import com.bsd.pjcloud.common.excel.annotation.ResponseExcel;
 import io.swagger.v3.oas.annotations.security.SecurityRequirement;
@@ -65,7 +64,7 @@ public class HardOrderController {
    @Idempotent(expireTime = 10, info = "正在创建订单中，请勿重复操作")
    public R appCreateOrder(@RequestParam Long carParentId) {
        PjcloudUser user = SecurityUtils.getUser();
-        HardAppCreateOrderDto dto = HardAppCreateOrderDto.builder().carParentId(carParentId).walletType(WalletTypeCodeEnum.CANTEEN).userId(user.getId()).orderType(HardOrderTypeEnum.RESERVE).payType(HardPayTypeEnum.WALLET_DEFAULT).build();
+        HardAppCreateOrderDto dto = HardAppCreateOrderDto.builder().carParentId(carParentId).walletType(WalletTypeEnum.EAT).userId(user.getId()).orderType(HardOrderTypeEnum.RESERVE).payType(HardPayTypeEnum.WALLET_DEFAULT).build();
        return R.ok(hardwareOrderService.appCreateOrder(dto));
    }
    /* ************************************* end app end ************************************* */
@@ -9,7 +9,6 @@ import com.bsd.pjcloud.hard.api.dto.order.HardCreateCarDto;
 import com.bsd.pjcloud.hard.api.entity.order.HardCarEntity;
 import com.bsd.pjcloud.hard.api.entity.order.HardParentCarEntity;
 import com.bsd.pjcloud.hard.api.vo.order.HardCarVo;
-import com.bsd.pjcloud.wallet.api.constant.WalletTypeCodeEnum;
 import jakarta.validation.constraints.NotEmpty;
 import jakarta.validation.constraints.NotNull;

@@ -8,7 +8,6 @@ import com.bsd.pjcloud.hard.api.dto.order.HardOrderDto;
 import com.bsd.pjcloud.hard.api.dto.order.app.HardAppCreateOrderDto;
 import com.bsd.pjcloud.hard.api.entity.order.HardOrderEntity;
 import com.bsd.pjcloud.hard.api.vo.order.HardOrderVo;
-import com.bsd.pjcloud.wallet.api.constant.WalletTypeCodeEnum;
 import jakarta.validation.Valid;

 public interface HardOrderService extends IService<HardOrderEntity> {
@@ -7,6 +7,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.bsd.pjcloud.canteen.api.feign.RemoteOnlineCanteenSpuService;
 import com.bsd.pjcloud.canteen.vo.app.CanteenOnlineSpuAppVO;
+import com.bsd.pjcloud.common.core.constant.enums.YesNoEnum;
 import com.bsd.pjcloud.common.core.util.BeanUtils;
 import com.bsd.pjcloud.hard.api.constant.HardTypeEnum;
 import com.bsd.pjcloud.hard.api.constant.order.HardOrderStatusEnum;
@@ -31,7 +31,7 @@ import com.bsd.pjcloud.hard.service.HardCarService;
 import com.bsd.pjcloud.hard.service.HardManagerService;
 import com.bsd.pjcloud.hard.service.HardOrderService;
 import com.bsd.pjcloud.wallet.api.constant.WalletBizEnum;
-import com.bsd.pjcloud.wallet.api.constant.WalletTypeCodeEnum;
+import com.bsd.pjcloud.wallet.api.constant.WalletTypeEnum;
 import com.bsd.pjcloud.wallet.api.dto.WalletBalanceTransactionDto;
 import com.bsd.pjcloud.wallet.api.entity.WalletManageEntity;
 import com.bsd.pjcloud.wallet.api.entity.WalletTransactionEntity;
@@ -122,7 +122,7 @@ public class HardwareOrderServiceImpl extends ServiceImpl<HardOrderMapper, HardO
        // 饭卡钱包
        WalletManageEntity wallet = null;
        if (isPay) {
-            R<WalletManageEntity> walletResult = remoteWalletService.getWallet(dto.getUserId(), WalletTypeCodeEnum.CANTEEN);
+            R<WalletManageEntity> walletResult = remoteWalletService.getWallet(dto.getUserId(), WalletTypeEnum.EAT);
            wallet = Optional.of(walletResult).map(R::getData).orElseThrow(() -> new RuntimeException("用户钱包不存在"));
        }
        int totalPrice = 0, extraPrice = 0, payPrice = 0;
@@ -191,7 +191,7 @@ public class HardwareOrderServiceImpl extends ServiceImpl<HardOrderMapper, HardO
            entity.setProductCount(v.getProductCount());
            return entity;
        }).toList();
-        HardTypeEnum hardType = ObjectUtil.equals(dto.getWalletType(), WalletTypeCodeEnum.CANTEEN) ? HardTypeEnum.CANTEEN : HardTypeEnum.SUPERMARKET;
+        HardTypeEnum hardType = ObjectUtil.equals(dto.getWalletType(), WalletTypeEnum.EAT) ? HardTypeEnum.CANTEEN : HardTypeEnum.SUPERMARKET;
        String subject = hardCarService.computerCarSubject(hardType, carListDto);
        // 添加硬件订单
        HardOrderEntity orderObj = HardOrderEntity.builder()
@@ -1,24 +0,0 @@
-package com.bsd.pjcloud.wallet.api.constant;
-
-import cn.hutool.core.util.ObjectUtil;
-import lombok.AllArgsConstructor;
-import lombok.Getter;
-
-import java.util.Arrays;
-
-@Getter
-@AllArgsConstructor
-public enum WalletTypeCodeEnum {
-    SUPERMARKET("1", "超市"),
-    CANTEEN("2", "食堂"),
-    ;
-    private final String code;
-
-    private final String desc;
-
-    public static WalletTypeCodeEnum descOf(String description) {
-        return Arrays.stream(WalletTypeCodeEnum.values())
-                .filter(v -> ObjectUtil.equal(v.getDesc(), description))
-                .findFirst().get();
-    }
-}
@@ -6,6 +6,9 @@ import lombok.Getter;

 import java.util.Arrays;

+/**
+ * 钱包的unique code
+ */
@Getter
@AllArgsConstructor
 public enum WalletTypeEnum {
@@ -3,7 +3,7 @@ package com.bsd.pjcloud.wallet.api.feign;
 import com.bsd.pjcloud.common.core.constant.ServiceNameConstants;
 import com.bsd.pjcloud.common.core.util.R;
 import com.bsd.pjcloud.common.feign.annotation.NoToken;
-import com.bsd.pjcloud.wallet.api.constant.WalletTypeCodeEnum;
+import com.bsd.pjcloud.wallet.api.constant.WalletTypeEnum;
 import com.bsd.pjcloud.wallet.api.entity.WalletManageEntity;
 import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.web.bind.annotation.GetMapping;
@@ -16,11 +16,11 @@ public interface RemoteWalletService {

    @NoToken
    @GetMapping("/wallet-manage/get-or-create-wallet")
-    R<WalletManageEntity> getOrCreateWallet(@RequestParam Long userId, @RequestParam(required = false) WalletTypeCodeEnum walletTypeCode);
+    R<WalletManageEntity> getOrCreateWallet(@RequestParam Long userId, @RequestParam(required = false) WalletTypeEnum walletTypeCode);

    @NoToken
    @GetMapping("/wallet-manage/get-wallet")
-    R<WalletManageEntity> getWallet(@RequestParam Long userId, @RequestParam WalletTypeCodeEnum walletTypeCode);
+    R<WalletManageEntity> getWallet(@RequestParam Long userId, @RequestParam WalletTypeEnum walletTypeCode);

    @NoToken
    @GetMapping("/wallet-manage/create-wallet")
@@ -6,15 +6,12 @@ import cn.hutool.core.util.ObjectUtil;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.bsd.pjcloud.admin.api.entity.SysUser;
-import com.bsd.pjcloud.common.core.exception.ErrorCodes;
-import com.bsd.pjcloud.common.core.util.MsgUtils;
 import com.bsd.pjcloud.common.core.util.R;
 import com.bsd.pjcloud.common.log.annotation.SysLog;
 import com.bsd.pjcloud.common.security.annotation.Inner;
 import com.bsd.pjcloud.common.security.service.PjcloudUser;
 import com.bsd.pjcloud.common.security.util.SecurityUtils;
-import com.bsd.pjcloud.wallet.api.constant.WalletTypeCodeEnum;
+import com.bsd.pjcloud.wallet.api.constant.WalletTypeEnum;
 import com.bsd.pjcloud.wallet.api.dto.WalletManageDto;
 import com.bsd.pjcloud.wallet.api.entity.WalletManageEntity;
 import com.bsd.pjcloud.wallet.service.WalletManageService;
@@ -49,7 +46,7 @@ public class WalletManageController {
    /* ************************************* start 远程调用 start ************************************* */
    @Inner
    @GetMapping("/get-or-create-wallet")
-    public R getOrCreateWallet(@RequestParam Long userId, @RequestParam WalletTypeCodeEnum walletTypeCode) {
+    public R getOrCreateWallet(@RequestParam Long userId, @RequestParam WalletTypeEnum walletTypeCode) {
        WalletManageEntity wallet = walletManageService.getOrCreateWallet(userId, walletTypeCode);
        if (ObjectUtil.isEmpty(wallet)) {
            return R.failed("用户钱包不存在");
@@ -66,7 +63,7 @@ public class WalletManageController {

    @Inner
    @GetMapping("/get-wallet")
-    public R getWallet(@RequestParam Long userId, @RequestParam WalletTypeCodeEnum walletTypeCode) {
+    public R getWallet(@RequestParam Long userId, @RequestParam WalletTypeEnum walletTypeCode) {
        WalletManageEntity wallet = walletManageService.getWallet(userId, walletTypeCode);
        if (ObjectUtil.isEmpty(wallet)) {
            return R.failed("用户钱包不存在");
@@ -3,11 +3,10 @@ package com.bsd.pjcloud.wallet.service;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.bsd.pjcloud.common.core.util.R;
-import com.bsd.pjcloud.wallet.api.constant.WalletTypeCodeEnum;
+import com.bsd.pjcloud.wallet.api.constant.WalletTypeEnum;
 import com.bsd.pjcloud.wallet.api.dto.WalletManageDto;
 import com.bsd.pjcloud.wallet.api.entity.WalletManageEntity;
 import com.bsd.pjcloud.wallet.api.vo.WalletManageVo;
-import jakarta.validation.constraints.NotEmpty;
 import jakarta.validation.constraints.NotNull;

 import java.util.List;
@@ -34,7 +33,7 @@ public interface WalletManageService extends IService<WalletManageEntity> {
     *
     * @param userId
     */
-    WalletManageEntity getOrCreateWallet(@NotNull Long userId, @NotNull WalletTypeCodeEnum walletTypeCode);
+    WalletManageEntity getOrCreateWallet(@NotNull Long userId, @NotNull WalletTypeEnum walletTypeCode);

    /**
     * 获取钱包(没有缓存)
@@ -43,7 +42,7 @@ public interface WalletManageService extends IService<WalletManageEntity> {
     * @param walletTypeCode
     * @return
     */
-    WalletManageEntity getWallet(@NotNull Long userId, @NotNull WalletTypeCodeEnum walletTypeCode);
+    WalletManageEntity getWallet(@NotNull Long userId, @NotNull WalletTypeEnum walletTypeCode);


    /**
@@ -1,14 +1,12 @@
 package com.bsd.pjcloud.wallet.service;

 import com.baomidou.mybatisplus.extension.service.IService;
-import com.bsd.pjcloud.wallet.api.constant.WalletTypeCodeEnum;
+import com.bsd.pjcloud.wallet.api.constant.WalletTypeEnum;
 import com.bsd.pjcloud.wallet.api.entity.WalletTypeEntity;

-import java.io.Serializable;
-
 public interface WalletTypeService extends IService<WalletTypeEntity> {

-    WalletTypeEntity getByUniqueCode(WalletTypeCodeEnum walletTypeCodeEnum);
+    WalletTypeEntity getByUniqueCode(WalletTypeEnum walletTypeCodeEnum);

    void create(WalletTypeEntity dto);

@@ -14,7 +14,7 @@ import com.bsd.pjcloud.common.core.constant.enums.YesNoEnum;
 import com.bsd.pjcloud.common.core.exception.CheckedException;
 import com.bsd.pjcloud.common.core.util.CollectionUtils;
 import com.bsd.pjcloud.common.core.util.R;
-import com.bsd.pjcloud.wallet.api.constant.WalletTypeCodeEnum;
+import com.bsd.pjcloud.wallet.api.constant.WalletTypeEnum;
 import com.bsd.pjcloud.wallet.api.dto.MchManageDto;
 import com.bsd.pjcloud.wallet.api.dto.WalletActiveDto;
 import com.bsd.pjcloud.wallet.api.entity.MchManageEntity;
@@ -23,7 +23,6 @@ import com.bsd.pjcloud.wallet.api.entity.WalletTypeEntity;
 import com.bsd.pjcloud.wallet.api.utils.MchDataUtil;
 import com.bsd.pjcloud.wallet.api.vo.MchManageVo;
 import com.bsd.pjcloud.wallet.api.vo.WalletActiveVo;
-import com.bsd.pjcloud.wallet.api.vo.WalletManageVo;
 import com.bsd.pjcloud.wallet.mapper.WalletActiveMapper;
 import com.bsd.pjcloud.wallet.service.MchManageService;
 import com.bsd.pjcloud.wallet.service.WalletActiveService;
@@ -61,7 +60,7 @@ public class WalletActiveServiceImpl extends ServiceImpl<WalletActiveMapper, Wal
    public void fastCreateCard(WalletActiveDto dto) {
        Long count = dto.getCount();
        // 查询饭卡钱包类型
-        WalletTypeEntity walletType = walletTypeService.getByUniqueCode(WalletTypeCodeEnum.CANTEEN);
+        WalletTypeEntity walletType = walletTypeService.getByUniqueCode(WalletTypeEnum.EAT);
        if (ObjectUtil.isEmpty(walletType)) throw new CheckedException("钱包类型不存在");
        // 查询商户
        MchManageEntity mchManage = mchManageService.getById(dto.getMerchantId());
@@ -15,7 +15,7 @@ import com.bsd.pjcloud.common.core.constant.CacheConstants;
 import com.bsd.pjcloud.common.core.util.CollectionUtils;
 import com.bsd.pjcloud.common.core.util.R;
 import com.bsd.pjcloud.common.data.resolver.ParamResolver;
-import com.bsd.pjcloud.wallet.api.constant.WalletTypeCodeEnum;
+import com.bsd.pjcloud.wallet.api.constant.WalletTypeEnum;
 import com.bsd.pjcloud.wallet.api.dto.WalletManageDto;
 import com.bsd.pjcloud.wallet.api.entity.WalletManageEntity;
 import com.bsd.pjcloud.wallet.api.entity.WalletTypeEntity;
@@ -103,7 +103,7 @@ public class WalletManageServiceImpl extends ServiceImpl<WalletManageMapper, Wal
    }

    @Override
-    public WalletManageEntity getOrCreateWallet(Long userId, WalletTypeCodeEnum walletTypeCode) {
+    public WalletManageEntity getOrCreateWallet(Long userId, WalletTypeEnum walletTypeCode) {
        WalletTypeEntity walletType = walletTypeService.getByUniqueCode(walletTypeCode);
        if (ObjectUtil.isEmpty(walletType)) return null;
        LambdaQueryWrapper<WalletManageEntity> walletQuery = new LambdaQueryWrapper<WalletManageEntity>().eq(WalletManageEntity::getUserId, userId).eq(WalletManageEntity::getWalletTypeId, walletType.getId());
@@ -113,7 +113,7 @@ public class WalletManageServiceImpl extends ServiceImpl<WalletManageMapper, Wal
    }

    @Override
-    public WalletManageEntity getWallet(Long userId, WalletTypeCodeEnum walletTypeCode) {
+    public WalletManageEntity getWallet(Long userId, WalletTypeEnum walletTypeCode) {
        WalletTypeEntity walletType = walletTypeService.getByUniqueCode(walletTypeCode);
        if (ObjectUtil.isEmpty(walletType)) return null;
        return baseMapper.selectOne(new LambdaQueryWrapper<WalletManageEntity>()
@@ -3,14 +3,11 @@ package com.bsd.pjcloud.wallet.service.impl;
 import cn.hutool.core.util.ObjectUtil;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.bsd.pjcloud.common.core.constant.CacheConstants;
 import com.bsd.pjcloud.common.core.exception.CheckedException;
-import com.bsd.pjcloud.wallet.api.constant.WalletTypeCodeEnum;
+import com.bsd.pjcloud.wallet.api.constant.WalletTypeEnum;
 import com.bsd.pjcloud.wallet.api.entity.WalletTypeEntity;
 import com.bsd.pjcloud.wallet.mapper.WalletTypeMapper;
 import com.bsd.pjcloud.wallet.service.WalletTypeService;
-import com.github.yulichang.query.MPJLambdaQueryWrapper;
-import org.springframework.cache.annotation.Cacheable;
 import org.springframework.stereotype.Service;

 import java.io.Serializable;
@@ -31,7 +28,7 @@ public class WalletTypeServiceImpl extends ServiceImpl<WalletTypeMapper, WalletT


    @Override
-    public WalletTypeEntity getByUniqueCode(WalletTypeCodeEnum walletTypeCodeEnum) {
+    public WalletTypeEntity getByUniqueCode(WalletTypeEnum walletTypeCodeEnum) {
        return baseMapper.selectOne(new LambdaQueryWrapper<WalletTypeEntity>()
                .eq(WalletTypeEntity::getUniqueCode, walletTypeCodeEnum.getCode())
        );