feat:订餐预约播报

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

@@ -14,7 +14,7 @@ import java.util.List;
 @Getter
 public enum HardOrderTypeEnum {
     BELOW("1", "线下购买"),
-    RESERVE("2", "线上订餐"),
+    RESERVE("2", "线上预定"),
     FOREIGN_TICKET("3", "外来人员"),
     STRIDE_DEPT("4", "跨单位"),
     ZY("5", "正元公务餐"),

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

@@ -21,7 +21,7 @@ public enum HardPayTypeEnum {
     FACE("4", "人脸识别支付"),
     STRIDE_DEPT_QR_CODE("5", "跨单位二维码支付"),
     FOREIGN_TICKET_QR_CODE("6", "外来人员二维码支付"),
-    RESERVE_QR_CODE("7", "线上订餐二维码支付"),
+    RESERVE_QR_CODE("7", "线上二维码支付"),
     CASH("8", "现金支付"),
     HARD_DOOR_FREE_PAY("9", "智能柜免密支付"),
     ;

pjcloud-hardware/pjcloud-hardware-api/src/main/java/com/bsd/pjcloud/hard/api/vo/HardBroadcastVo.java

@@ -41,5 +41,7 @@ public class HardBroadcastVo extends HardBroadcastEntity implements BaseHardInte
 
     private Integer payPrice;
 
+    private String hourType;
+
 
 }

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

@@ -195,10 +195,14 @@ public class HardBroadcastServiceImpl extends ServiceImpl<HardBroadcastMapper, H
     public void androidDoneBroadcast(HardAdBroadcastDto dto) {
         if (ObjectUtil.isEmpty(dto.getIds())) return;
         if (ObjectUtil.isEmpty(dto.getCount())) dto.setCount(1);
-        baseMapper.update(new LambdaUpdateWrapper<HardBroadcastEntity>()
-                .setSql(" broadcast_count = broadcast_count + " + dto.getCount())
-                .in(HardBroadcastEntity::getId, dto.getIds())
-        );
+        LambdaUpdateWrapper<HardBroadcastEntity> updateWrapper = new LambdaUpdateWrapper<HardBroadcastEntity>();
+        if (ObjectUtil.equals(dto.getCount(), -1)) {
+            updateWrapper.setSql(" broadcast_count = 0 ");
+        } else {
+            updateWrapper.setSql(" broadcast_count = broadcast_count + " + dto.getCount());
+        }
+        updateWrapper.in(HardBroadcastEntity::getId, dto.getIds());
+        baseMapper.update(updateWrapper);
     }
 
     private void disposeList(List<HardBroadcastVo> list, HardBroadcastDto dto) {

pjcloud-hardware/pjcloud-hardware-biz/src/main/resources/mapper/HardBroadcastMapper.xml

@@ -77,6 +77,7 @@
     <select id="scopePageJoin" resultType="com.bsd.pjcloud.hard.api.vo.HardBroadcastVo">
         <include refid="selectA"/>
         o.id as orderId,
+        o.hour_type as hourType,
         o.product_desc as productDesc,
         o.pay_price as payPrice
         from hard_broadcast a

pjcloud-wallet/pjcloud-wallet-biz/src/main/java/com/bsd/pjcloud/wallet/service/impl/WalletCodeUseServiceImpl.java

@@ -78,12 +78,24 @@ public class WalletCodeUseServiceImpl extends ServiceImpl<WalletCodeUseMapper, W
     @Transactional(rollbackFor = Exception.class)
     public Boolean generate(Long id, Long userId, WalletCodeBizEnum biz, Integer count) {
         if (count == 0) return false;
-        HardOrderTypeEnum orderType = HardOrderTypeEnum.FOREIGN_TICKET;
-        HardPayTypeEnum payType = HardPayTypeEnum.FOREIGN_TICKET_QR_CODE;
+        HardOrderTypeEnum orderType = null;
+        HardPayTypeEnum payType = null;
         if (biz == WalletCodeBizEnum.STRIDE) {
             orderType = HardOrderTypeEnum.STRIDE_DEPT;
             payType = HardPayTypeEnum.STRIDE_DEPT_QR_CODE;
         }
+        if (biz == WalletCodeBizEnum.FOREIGN) {
+            orderType = HardOrderTypeEnum.FOREIGN_TICKET;
+            payType = HardPayTypeEnum.FOREIGN_TICKET_QR_CODE;
+        }
+        if (biz == WalletCodeBizEnum.CANTEEN_RESERVE) {
+            orderType = HardOrderTypeEnum.RESERVE;
+            payType = HardPayTypeEnum.RESERVE_QR_CODE;
+        }
+        if (biz == WalletCodeBizEnum.SUPERMARKET_RESERVE) {
+            orderType = HardOrderTypeEnum.RESERVE;
+            payType = HardPayTypeEnum.RESERVE_QR_CODE;
+        }
         for (int i = 0; i < count; i++) {
             WalletCodeUseEntity item = WalletCodeUseEntity.builder().bizId(id).userId(userId).bizType(biz.getCode()).build();
             int insert = baseMapper.insert(item);
@@ -91,13 +103,13 @@ public class WalletCodeUseServiceImpl extends ServiceImpl<WalletCodeUseMapper, W
                 QRCodeDto dto = QRCodeDto.builder().id(id).itemId(item.getId()).userId(item.getUserId()).orderType(orderType.getType()).payType(payType.getType()).exceedTime(-1L).build();
                 try {
                     ImmutablePair<String, String> code = HardUtil.generate(dto);
-                    byte[] bytes = QRCodeImageGenerator.generateQrCodeImage(code.getRight(), 1024);
+                    // 生成短码
+                    String shortCode = generateShortCode(code.getRight());
+                    byte[] bytes = QRCodeImageGenerator.generateQrCodeImage(shortCode, 1024);
                     MultipartFile multipartFile = new MockMultipartFile("file", code.getLeft() + ".png", "image/png", new ByteArrayInputStream(bytes));
                     R upload = remoteFileService.innerUpload(multipartFile, null, null, null);
                     Map data = (Map) upload.getData();
                     String url = (String) data.get("url");
-                    // 生成短码
-                    String shortCode = generateShortCode(code.getRight());
                     // 更新
                     WalletCodeUseEntity updateObj = WalletCodeUseEntity.builder().id(item.getId()).code(url).codeContent(code.getRight()).shortCode(shortCode).build();
                     baseMapper.updateById(updateObj);