feat:钱包记账扣款记录

pjcloud-hardware/pjcloud-hardware-api/src/main/java/com/bsd/pjcloud/hard/api/constant/HardTypeEnum.java

@@ -19,12 +19,16 @@ public enum HardTypeEnum {
     CANTEEN("2", "食堂"),
     READ_CARD("3", "读卡器"),
     DOOR("4", "生鲜柜"),
+    MERCHANT_QR_CODE("5", "商户二维码扣款牌"),
     ;
     private final String type;
     private final String description;
 
     // 是否能预定
-    private static final List<HardTypeEnum> isReserveList = List.of(SUPERMARKET, CANTEEN);
+    public static final List<HardTypeEnum> isReserveList = List.of(SUPERMARKET, CANTEEN);
+
+    // 不需要创建购物车
+    public static final List<HardTypeEnum> isNoneCar = List.of(MERCHANT_QR_CODE);
 
     public static Boolean isReserve(HardTypeEnum type) {
         return isReserveList.contains(type);

pjcloud-hardware/pjcloud-hardware-api/src/main/java/com/bsd/pjcloud/hard/api/constant/order/HardPayTypeEnum.java

@@ -15,6 +15,7 @@ import java.util.Arrays;
 public enum HardPayTypeEnum {
     WALLET_DEFAULT("1", "普通钱包支付"),
     WALLET_QR_CODE("2", "钱包二维码支付"),
+    WALLET_QR_CODE_SCAN("22", "钱包扫一扫支付"),
     WALLET_CARD("3", "钱包饭卡支付"),
     FACE("4", "人脸识别支付"),
     STRIDE_DEPT_QR_CODE("5", "跨单位二维码支付"),

pjcloud-hardware/pjcloud-hardware-api/src/main/java/com/bsd/pjcloud/hard/api/dto/app/HardAppCreateOrderScancode.java

@@ -0,0 +1,18 @@
+package com.bsd.pjcloud.hard.api.dto.app;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import jakarta.validation.constraints.NotNull;
+import lombok.Data;
+
+@Data
+public class HardAppCreateOrderScancode {
+
+    @Schema(description = "商户id")
+    @NotNull(message = "商户id不能为空")
+    private Long merchantId;
+
+    @Schema(description = "用户输入的价格")
+    @NotNull(message = "自定义金额不能为空")
+    private Integer customPrice;
+
+}

pjcloud-hardware/pjcloud-hardware-api/src/main/java/com/bsd/pjcloud/hard/api/dto/order/app/HardAppCreateOrderDto.java

@@ -4,6 +4,7 @@ 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.WalletTypeEnum;
+import io.swagger.v3.oas.annotations.media.Schema;
 import jakarta.validation.constraints.NotNull;
 import lombok.AllArgsConstructor;
 import lombok.Builder;
@@ -16,7 +17,6 @@ import lombok.NoArgsConstructor;
 @Data
 public class HardAppCreateOrderDto {
 
-    @NotNull(message = "父订单id不能为空")
     private Long carParentId;
 
     @NotNull(message = "用户id不能为空")
@@ -36,4 +36,10 @@ public class HardAppCreateOrderDto {
 
     private Long orderSourceTypeId;
 
+    // 用户自定义的价格(分)不是通过计算购物车总价得来的
+    private Integer customPrice;
+
+    // 商户id
+    private Long merchantId;
+
 }

pjcloud-hardware/pjcloud-hardware-biz/src/main/java/com/bsd/pjcloud/hard/controller/order/HardOrderController.java

@@ -23,6 +23,7 @@ import com.bsd.pjcloud.hard.api.constant.HardTypeEnum;
 import com.bsd.pjcloud.hard.api.constant.order.HardHourTypeEnum;
 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.app.HardAppCreateOrderScancode;
 import com.bsd.pjcloud.hard.api.dto.order.HardOrderDto;
 import com.bsd.pjcloud.hard.api.dto.order.HardOrderPreferencesDto;
 import com.bsd.pjcloud.hard.api.dto.order.app.HardAppCreateOrderDto;
@@ -41,6 +42,7 @@ import org.springframework.http.HttpHeaders;
 import io.swagger.v3.oas.annotations.tags.Tag;
 import io.swagger.v3.oas.annotations.Operation;
 import lombok.RequiredArgsConstructor;
+import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 
 import java.io.IOException;
@@ -102,6 +104,22 @@ public class HardOrderController {
         HardAppCreateOrderDto dto = HardAppCreateOrderDto.builder().carParentId(carParentId).walletType(WalletTypeEnum.EAT).hardType(hardType).userId(user.getId()).orderType(HardOrderTypeEnum.RESERVE).payType(HardPayTypeEnum.WALLET_DEFAULT).build();
         return R.ok(hardwareOrderService.appCreateOrder(dto));
     }
+
+    @Operation(summary = "app创建订单扫一扫", description = "app创建订单扫一扫")
+    @PostMapping("/app/create-order-scan-qrcode")
+    @Idempotent(expireTime = 10, info = "正在创建订单中，请勿重复操作")
+    public R appCreateOrderScancode(@Validated @RequestBody HardAppCreateOrderScancode body) {
+        PjcloudUser user = SecurityUtils.getUser();
+        HardAppCreateOrderDto dto = HardAppCreateOrderDto.builder()
+                .customPrice(body.getCustomPrice())
+                .userId(user.getId())
+                .hardType(HardTypeEnum.MERCHANT_QR_CODE)
+                .orderType(HardOrderTypeEnum.RESERVE)
+                .walletType(WalletTypeEnum.EAT)
+                .payType(HardPayTypeEnum.WALLET_QR_CODE_SCAN)
+                .build();
+        return R.ok(hardwareOrderService.appCreateOrderScancode(dto));
+    }
     /* ************************************* end app end ************************************* */
 
     @Operation(summary = "分页查询", description = "分页查询")

pjcloud-hardware/pjcloud-hardware-biz/src/main/java/com/bsd/pjcloud/hard/service/HardOrderService.java

@@ -30,6 +30,11 @@ public interface HardOrderService extends IService<HardOrderEntity> {
      */
     Long appCreateOrder(@Valid HardAppCreateOrderDto dto);
 
+    /**
+     * 创建app订单
+     */
+    Long appCreateOrderScancode(@Valid HardAppCreateOrderDto dto);
+
     /**
      * 快速扣款,离线订单使用
      */

pjcloud-hardware/pjcloud-hardware-biz/src/main/java/com/bsd/pjcloud/hard/service/impl/order/HardOrderServiceImpl.java

@@ -337,6 +337,46 @@ public class HardOrderServiceImpl extends ServiceImpl<HardOrderMapper, HardOrder
         return orderObj.getId();
     }
 
+    @Override
+    // @GlobalTransactional
+    @Transactional(rollbackFor = Exception.class)
+    public Long appCreateOrderScancode(HardAppCreateOrderDto dto) {
+        // 钱包
+        WalletManageEntity wallet = remoteWalletService.getWallet(dto.getUserId(), dto.getWalletType()).getData();
+        if (ObjectUtil.isEmpty(wallet)) throw new RuntimeException("用户钱包不存在");
+        Integer balance = wallet.getBalance();
+        int totalPrice = dto.getCustomPrice();
+        String subject = "未知商品 * ?";
+        if (balance < totalPrice) {
+            throw new RuntimeException("钱包余额不足");
+        }
+        // 添加硬件订单
+        HardOrderEntity orderObj = HardOrderEntity.builder()
+                .userId(dto.getUserId())
+                .parentCarId(dto.getCarParentId())
+                .sysType(dto.getHardType().getType())
+                .orderStatus(HardOrderStatusEnum.CREATE.getType())
+                .merchantId(null)
+                .orderType(dto.getOrderType().getType())
+                .payType(dto.getPayType().getType())
+                .orderSourceTypeId(dto.getOrderSourceTypeId())
+                .totalPrice(totalPrice)
+                .extraPrice(0)
+                .payPrice(totalPrice)
+                .isOfflineOrder(YesNoEnum.NO.getCode())
+                .productDesc(subject)
+                .build();
+        orderObj.setWalletId(wallet.getId());
+        baseMapper.insert(orderObj);
+        // 钱包扣款
+        getSelf().fastReduceBalance(orderObj);
+        // 是否需要创建二维码
+        getSelf().generateCode(orderObj);
+        // 扣减库存
+        // getSelf().fastenerInventory(orderObj, YesNoEnum.YES);
+        return orderObj.getId();
+    }
+
     @Override
     @Transactional(rollbackFor = Exception.class)
     public void fastReduceBalance(HardOrderEntity order) {