From 4c53c8360ef4964f4c85bd3b4ce08b5a36a7a968 Mon Sep 17 00:00:00 2001
From: dzc <2388224167@qq.com>
Date: Fri, 17 Jan 2025 13:19:35 +0800
Subject: [PATCH] =?UTF-8?q?fix:=E7=A1=AC=E4=BB=B6=E6=A8=A1=E5=9D=97bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../hard/controller/HardGroupController.java  | 10 +++++++---
 .../pjcloud/hard/mapper/HardGroupMapper.java  |  2 +-
 .../hard/service/HardGroupService.java        |  4 ++++
 .../service/impl/HardGroupServiceImpl.java    | 19 ++++++++++++++++++-
 .../service/impl/HardManagerServiceImpl.java  |  3 ++-
 .../impl/order/HardAfterSaleServiceImpl.java  |  2 +-
 .../impl/order/HardOrderServiceImpl.java      | 14 +++++++++-----
 .../bsd/pjcloud/mqtt/service/MqttService.java |  4 +++-
 .../wallet/api/entity/MchManageEntity.java    |  4 ++--
 .../service/impl/MchManageServiceImpl.java    |  2 +-
 .../impl/WalletCodeUseServiceImpl.java        |  2 +-
 .../impl/WalletSettingServiceImpl.java        |  4 ++--
 .../impl/WalletTransactionServiceImpl.java    |  6 +++---
 13 files changed, 54 insertions(+), 22 deletions(-)

diff --git a/pjcloud-hardware/pjcloud-hardware-biz/src/main/java/com/bsd/pjcloud/hard/controller/HardGroupController.java b/pjcloud-hardware/pjcloud-hardware-biz/src/main/java/com/bsd/pjcloud/hard/controller/HardGroupController.java
index 5c52cbc0c..6d4455ad6 100644
--- a/pjcloud-hardware/pjcloud-hardware-biz/src/main/java/com/bsd/pjcloud/hard/controller/HardGroupController.java
+++ b/pjcloud-hardware/pjcloud-hardware-biz/src/main/java/com/bsd/pjcloud/hard/controller/HardGroupController.java
@@ -7,6 +7,8 @@ import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.bsd.pjcloud.common.core.util.R;
 import com.bsd.pjcloud.common.log.annotation.SysLog;
+import com.bsd.pjcloud.common.security.service.PjcloudUser;
+import com.bsd.pjcloud.common.security.util.SecurityUtils;
 import com.bsd.pjcloud.hard.api.dto.HardGroupDto;
 import com.bsd.pjcloud.hard.api.entity.HardGroupEntity;
 import com.bsd.pjcloud.hard.service.HardGroupService;
@@ -41,7 +43,7 @@ public class HardGroupController {
     @GetMapping("/page-join")
     @PreAuthorize("@pms.hasPermission('hard_hardGroup_view')")
     public R pageJoin(@ParameterObject Page page, @ParameterObject HardGroupDto dto) {
-        return R.ok(hardGroupService.pageJoin(page, dto));
+        return R.ok(hardGroupService.scopePageList(page, dto));
     }
 
     @Operation(summary = "分页查询", description = "分页查询")
@@ -64,7 +66,8 @@ public class HardGroupController {
     @PostMapping
     @PreAuthorize("@pms.hasPermission('hard_hardGroup_add')")
     public R save(@RequestBody HardGroupEntity hardGroup) {
-        return R.ok(hardGroupService.save(hardGroup));
+        PjcloudUser user = SecurityUtils.getUser();
+        return R.ok(hardGroupService.create(hardGroup, user));
     }
 
     @Operation(summary = "修改设备分组", description = "修改设备分组")
@@ -72,7 +75,8 @@ public class HardGroupController {
     @PutMapping
     @PreAuthorize("@pms.hasPermission('hard_hardGroup_edit')")
     public R updateById(@RequestBody HardGroupEntity hardGroup) {
-        return R.ok(hardGroupService.updateById(hardGroup));
+        PjcloudUser user = SecurityUtils.getUser();
+        return R.ok(hardGroupService.edit(hardGroup, user));
     }
 
     @Operation(summary = "通过id删除设备分组", description = "通过id删除设备分组")
diff --git a/pjcloud-hardware/pjcloud-hardware-biz/src/main/java/com/bsd/pjcloud/hard/mapper/HardGroupMapper.java b/pjcloud-hardware/pjcloud-hardware-biz/src/main/java/com/bsd/pjcloud/hard/mapper/HardGroupMapper.java
index 242442a53..69bf45497 100644
--- a/pjcloud-hardware/pjcloud-hardware-biz/src/main/java/com/bsd/pjcloud/hard/mapper/HardGroupMapper.java
+++ b/pjcloud-hardware/pjcloud-hardware-biz/src/main/java/com/bsd/pjcloud/hard/mapper/HardGroupMapper.java
@@ -19,7 +19,7 @@ public interface HardGroupMapper extends PjcloudBaseMapper<HardGroupEntity> {
 
     default Page<HardGroupVo> pageJoin(Page page, HardGroupDto dto) {
         MPJLambdaWrapper<HardGroupEntity> wrapper = new MPJLambdaWrapper<HardGroupEntity>()
-                .like(HardGroupEntity::getName, dto.getName());
+                .like(ObjectUtil.isNotEmpty(dto.getName()),HardGroupEntity::getName, dto.getName());
         return selectJoinPage(page, HardGroupVo.class, wrapper);
     }
 
diff --git a/pjcloud-hardware/pjcloud-hardware-biz/src/main/java/com/bsd/pjcloud/hard/service/HardGroupService.java b/pjcloud-hardware/pjcloud-hardware-biz/src/main/java/com/bsd/pjcloud/hard/service/HardGroupService.java
index c13347e4f..2f143f798 100644
--- a/pjcloud-hardware/pjcloud-hardware-biz/src/main/java/com/bsd/pjcloud/hard/service/HardGroupService.java
+++ b/pjcloud-hardware/pjcloud-hardware-biz/src/main/java/com/bsd/pjcloud/hard/service/HardGroupService.java
@@ -2,6 +2,7 @@ package com.bsd.pjcloud.hard.service;
 
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.IService;
+import com.bsd.pjcloud.common.security.service.PjcloudUser;
 import com.bsd.pjcloud.hard.api.dto.HardGroupDto;
 import com.bsd.pjcloud.hard.api.entity.HardGroupEntity;
 import com.bsd.pjcloud.hard.api.vo.HardGroupVo;
@@ -12,4 +13,7 @@ public interface HardGroupService extends IService<HardGroupEntity> {
 
     Page<HardGroupVo> scopePageList(Page page, HardGroupDto dto);
 
+    Long create(HardGroupEntity hardGroup, PjcloudUser user);
+
+    Boolean edit(HardGroupEntity hardGroup, PjcloudUser user);
 }
\ No newline at end of file
diff --git a/pjcloud-hardware/pjcloud-hardware-biz/src/main/java/com/bsd/pjcloud/hard/service/impl/HardGroupServiceImpl.java b/pjcloud-hardware/pjcloud-hardware-biz/src/main/java/com/bsd/pjcloud/hard/service/impl/HardGroupServiceImpl.java
index da3ce1197..fc253caa5 100644
--- a/pjcloud-hardware/pjcloud-hardware-biz/src/main/java/com/bsd/pjcloud/hard/service/impl/HardGroupServiceImpl.java
+++ b/pjcloud-hardware/pjcloud-hardware-biz/src/main/java/com/bsd/pjcloud/hard/service/impl/HardGroupServiceImpl.java
@@ -7,10 +7,10 @@ import com.bsd.pjcloud.admin.api.entity.SysDept;
 import com.bsd.pjcloud.admin.api.feign.RemoteDeptService;
 import com.bsd.pjcloud.admin.api.utils.DataUtil;
 import com.bsd.pjcloud.common.core.util.R;
+import com.bsd.pjcloud.common.security.service.PjcloudUser;
 import com.bsd.pjcloud.hard.api.dto.HardGroupDto;
 import com.bsd.pjcloud.hard.api.entity.HardGroupEntity;
 import com.bsd.pjcloud.hard.api.vo.HardGroupVo;
-import com.bsd.pjcloud.hard.api.vo.HardManagerVo;
 import com.bsd.pjcloud.hard.mapper.HardGroupMapper;
 import com.bsd.pjcloud.hard.service.HardGroupService;
 import lombok.RequiredArgsConstructor;
@@ -66,4 +66,21 @@ public class HardGroupServiceImpl extends ServiceImpl<HardGroupMapper, HardGroup
         }
         return list;
     }
+
+    @Override
+    public Long create(HardGroupEntity hardGroup, PjcloudUser user) {
+        if (ObjectUtil.isNotEmpty(hardGroup.getDeptId())) {
+            hardGroup.setDeptId(hardGroup.getDeptId());
+        }
+        baseMapper.insert(hardGroup);
+        return hardGroup.getId();
+    }
+
+    @Override
+    public Boolean edit(HardGroupEntity hardGroup, PjcloudUser user) {
+        if (ObjectUtil.isNotEmpty(hardGroup.getDeptId())) {
+            hardGroup.setDeptId(hardGroup.getDeptId());
+        }
+        return baseMapper.updateById(hardGroup) > 0;
+    }
 }
\ No newline at end of file
diff --git a/pjcloud-hardware/pjcloud-hardware-biz/src/main/java/com/bsd/pjcloud/hard/service/impl/HardManagerServiceImpl.java b/pjcloud-hardware/pjcloud-hardware-biz/src/main/java/com/bsd/pjcloud/hard/service/impl/HardManagerServiceImpl.java
index b9576e9e4..44da699d4 100644
--- a/pjcloud-hardware/pjcloud-hardware-biz/src/main/java/com/bsd/pjcloud/hard/service/impl/HardManagerServiceImpl.java
+++ b/pjcloud-hardware/pjcloud-hardware-biz/src/main/java/com/bsd/pjcloud/hard/service/impl/HardManagerServiceImpl.java
@@ -125,7 +125,7 @@ public class HardManagerServiceImpl extends ServiceImpl<HardManagerMapper, HardM
             throw new RuntimeException("请设置顶级部门硬件分组");
         }
         dto.setHardGroupId(deptHardGroup.getHardGroupId());
-        dto.setDeptId(user.getDeptId());
+        dto.setDeptId(mch.getDeptId());
         // mq地址和端口
         dto.setMqSocketAddress(mqttConfig.getAndroidAddress());
         dto.setMqSocketPort(mqttConfig.getAndroidPort());
@@ -160,6 +160,7 @@ public class HardManagerServiceImpl extends ServiceImpl<HardManagerMapper, HardM
         if (ObjectUtil.isEmpty(deptHardGroup)) {
             throw new RuntimeException("请设置顶级部门硬件分组");
         }
+        dto.setDeptId(mch.getDeptId());
         dto.setHardGroupId(deptHardGroup.getHardGroupId());
         if (!ObjectUtil.equals(dto.getMerchantId(), detail.getMerchantId())) {
             // topic
diff --git a/pjcloud-hardware/pjcloud-hardware-biz/src/main/java/com/bsd/pjcloud/hard/service/impl/order/HardAfterSaleServiceImpl.java b/pjcloud-hardware/pjcloud-hardware-biz/src/main/java/com/bsd/pjcloud/hard/service/impl/order/HardAfterSaleServiceImpl.java
index eb8aa8f74..342c2755e 100644
--- a/pjcloud-hardware/pjcloud-hardware-biz/src/main/java/com/bsd/pjcloud/hard/service/impl/order/HardAfterSaleServiceImpl.java
+++ b/pjcloud-hardware/pjcloud-hardware-biz/src/main/java/com/bsd/pjcloud/hard/service/impl/order/HardAfterSaleServiceImpl.java
@@ -229,7 +229,7 @@ public class HardAfterSaleServiceImpl extends ServiceImpl<HardAfterSaleMapper, H
     }
 
     @Override
-    @GlobalTransactional
+    // @GlobalTransactional
     @Transactional(rollbackFor = Exception.class)
     public Boolean agreeAfterSale(Long userId, Long id) {
         HardAfterSaleEntity afterSale = validateAfterSaleAuditable(id);
diff --git a/pjcloud-hardware/pjcloud-hardware-biz/src/main/java/com/bsd/pjcloud/hard/service/impl/order/HardOrderServiceImpl.java b/pjcloud-hardware/pjcloud-hardware-biz/src/main/java/com/bsd/pjcloud/hard/service/impl/order/HardOrderServiceImpl.java
index 5bf80bde9..f86e5ef61 100644
--- a/pjcloud-hardware/pjcloud-hardware-biz/src/main/java/com/bsd/pjcloud/hard/service/impl/order/HardOrderServiceImpl.java
+++ b/pjcloud-hardware/pjcloud-hardware-biz/src/main/java/com/bsd/pjcloud/hard/service/impl/order/HardOrderServiceImpl.java
@@ -241,7 +241,7 @@ public class HardOrderServiceImpl extends ServiceImpl<HardOrderMapper, HardOrder
 
     /* ************************************* start 支付相关 start ************************************* */
     @Override
-    @GlobalTransactional
+    // @GlobalTransactional
     @Transactional(rollbackFor = Exception.class)
     public Long createOrder(HardCreateOrderDto dto) {
         if (!validateCreateOrderDto(dto)) return null;
@@ -269,8 +269,12 @@ public class HardOrderServiceImpl extends ServiceImpl<HardOrderMapper, HardOrder
         totalPrice = hardCarService.computerCarTotalPrice(dto.getSysType(), dto.getOrderType(), dto.getList());
         if (isExtraPrice) extraPrice = computeExtraPrice(totalPrice);
         payPrice = totalPrice + extraPrice;
-        // 判断余额够不够支付
-        if (isPay && wallet.getBalance() < payPrice) throw new RuntimeException("钱包余额不足");
+        if (isPay) {
+            // 如果是支付的话,不能小于等于0
+            if (payPrice <= 0) throw new RuntimeException("支付金额为0元");
+            // 判断余额够不够支付
+            if (wallet.getBalance() < payPrice) throw new RuntimeException("钱包余额不足");
+        }
         // 添加购物车
         Long parentCarId = hardCarService.createCard(dto.getUserId(), dto.getMerchantId(), dto.getSysType(), dto.getOrderType(), dto.getList());
         // 获取商品描述
@@ -305,7 +309,7 @@ public class HardOrderServiceImpl extends ServiceImpl<HardOrderMapper, HardOrder
     }
 
     @Override
-    @GlobalTransactional
+    // @GlobalTransactional
     @Transactional(rollbackFor = Exception.class)
     public Long appCreateOrder(@Valid HardAppCreateOrderDto dto) {
         // 钱包
@@ -424,7 +428,7 @@ public class HardOrderServiceImpl extends ServiceImpl<HardOrderMapper, HardOrder
     }
 
     @Override
-    @GlobalTransactional
+    // @GlobalTransactional
     @Transactional(rollbackFor = Exception.class)
     public void cancelCode(HardOrderEntity order) {
         HardOrderTypeEnum orderTypeEnum = HardOrderTypeEnum.valueOfByType(order.getOrderType());
diff --git a/pjcloud-mqtt/pjcloud-mqtt-biz/src/main/java/com/bsd/pjcloud/mqtt/service/MqttService.java b/pjcloud-mqtt/pjcloud-mqtt-biz/src/main/java/com/bsd/pjcloud/mqtt/service/MqttService.java
index f39151791..9f71cb93a 100644
--- a/pjcloud-mqtt/pjcloud-mqtt-biz/src/main/java/com/bsd/pjcloud/mqtt/service/MqttService.java
+++ b/pjcloud-mqtt/pjcloud-mqtt-biz/src/main/java/com/bsd/pjcloud/mqtt/service/MqttService.java
@@ -43,7 +43,9 @@ public class MqttService {
             options.setCleanSession(true);
             options.setUserName(mqttConfig.getUsername());
             options.setPassword(mqttConfig.getPassword().toCharArray());
-            // crtAuth(options);
+            if (mqttConfig.getHostUrl().contains("ssl:")) {
+                crtAuth(options);
+            }
             client.setCallback(mqttCallBack);
             client.connect(options);
             if (!client.isConnected()) {
diff --git a/pjcloud-wallet/pjcloud-wallet-api/src/main/java/com/bsd/pjcloud/wallet/api/entity/MchManageEntity.java b/pjcloud-wallet/pjcloud-wallet-api/src/main/java/com/bsd/pjcloud/wallet/api/entity/MchManageEntity.java
index c6fb65b30..eb00f4a3d 100644
--- a/pjcloud-wallet/pjcloud-wallet-api/src/main/java/com/bsd/pjcloud/wallet/api/entity/MchManageEntity.java
+++ b/pjcloud-wallet/pjcloud-wallet-api/src/main/java/com/bsd/pjcloud/wallet/api/entity/MchManageEntity.java
@@ -33,9 +33,9 @@ public class MchManageEntity extends Model<MchManageEntity> {
     private Long id;
 
 	/**
-	* 绑定的部门id
+	* 绑定的部门id - 商户的部门id
 	*/
-    @Schema(description="绑定的部门id")
+    @Schema(description="商户的部门id")
     private Long deptId;
 
 	/**
diff --git a/pjcloud-wallet/pjcloud-wallet-biz/src/main/java/com/bsd/pjcloud/wallet/service/impl/MchManageServiceImpl.java b/pjcloud-wallet/pjcloud-wallet-biz/src/main/java/com/bsd/pjcloud/wallet/service/impl/MchManageServiceImpl.java
index 69077e0a8..64786ac3c 100644
--- a/pjcloud-wallet/pjcloud-wallet-biz/src/main/java/com/bsd/pjcloud/wallet/service/impl/MchManageServiceImpl.java
+++ b/pjcloud-wallet/pjcloud-wallet-biz/src/main/java/com/bsd/pjcloud/wallet/service/impl/MchManageServiceImpl.java
@@ -95,7 +95,7 @@ public class MchManageServiceImpl extends ServiceImpl<MchManageMapper, MchManage
     }
 
     @Override
-    @CacheEvict(value = CacheConstants.WALLET_MCH, key = "#dto.getId()", condition = "#dto.getId() != null")
+    // @CacheEvict(value = CacheConstants.WALLET_MCH, key = "#dto.getId()", condition = "#dto.getId() != null")
     public void edit(MchManageEntity dto) {
         if (existName(dto.getName(), dto.getId())) {
             throw new CheckedException("商户名不能重复");
diff --git a/pjcloud-wallet/pjcloud-wallet-biz/src/main/java/com/bsd/pjcloud/wallet/service/impl/WalletCodeUseServiceImpl.java b/pjcloud-wallet/pjcloud-wallet-biz/src/main/java/com/bsd/pjcloud/wallet/service/impl/WalletCodeUseServiceImpl.java
index 58c4265eb..8cec2034b 100644
--- a/pjcloud-wallet/pjcloud-wallet-biz/src/main/java/com/bsd/pjcloud/wallet/service/impl/WalletCodeUseServiceImpl.java
+++ b/pjcloud-wallet/pjcloud-wallet-biz/src/main/java/com/bsd/pjcloud/wallet/service/impl/WalletCodeUseServiceImpl.java
@@ -105,7 +105,7 @@ public class WalletCodeUseServiceImpl extends ServiceImpl<WalletCodeUseMapper, W
     }
 
     @Override
-    @GlobalTransactional
+    // @GlobalTransactional
     @Transactional(rollbackFor = Exception.class)
     public Boolean cancelCode(Long id) {
         WalletCodeUseEntity codeUse = baseMapper.selectOne(new LambdaQueryWrapper<WalletCodeUseEntity>()
diff --git a/pjcloud-wallet/pjcloud-wallet-biz/src/main/java/com/bsd/pjcloud/wallet/service/impl/WalletSettingServiceImpl.java b/pjcloud-wallet/pjcloud-wallet-biz/src/main/java/com/bsd/pjcloud/wallet/service/impl/WalletSettingServiceImpl.java
index f8067d48f..897b7d639 100644
--- a/pjcloud-wallet/pjcloud-wallet-biz/src/main/java/com/bsd/pjcloud/wallet/service/impl/WalletSettingServiceImpl.java
+++ b/pjcloud-wallet/pjcloud-wallet-biz/src/main/java/com/bsd/pjcloud/wallet/service/impl/WalletSettingServiceImpl.java
@@ -30,7 +30,7 @@ import java.util.List;
 public class WalletSettingServiceImpl extends ServiceImpl<WalletSettingMapper, WalletSettingEntity> implements WalletSettingService {
 
     @Override
-    @Cacheable(value = CacheConstants.WALLET_SETTING_DETAIL)
+    // @Cacheable(value = CacheConstants.WALLET_SETTING_DETAIL)
     public WalletSettingVo getSetting() {
         WalletSettingEntity setting = baseMapper.selectOne(new QueryWrapper<>());
         if (ObjectUtil.isEmpty(setting)) {
@@ -42,7 +42,7 @@ public class WalletSettingServiceImpl extends ServiceImpl<WalletSettingMapper, W
     }
 
     @Override
-    @CacheEvict(value = CacheConstants.WALLET_SETTING_DETAIL, allEntries = true)
+    // @CacheEvict(value = CacheConstants.WALLET_SETTING_DETAIL, allEntries = true)
     public void edit(WalletSettingDto dto) {
         WalletSettingEntity setting = baseMapper.selectById(dto.getId());
         if (ObjectUtil.isEmpty(setting)) {
diff --git a/pjcloud-wallet/pjcloud-wallet-biz/src/main/java/com/bsd/pjcloud/wallet/service/impl/WalletTransactionServiceImpl.java b/pjcloud-wallet/pjcloud-wallet-biz/src/main/java/com/bsd/pjcloud/wallet/service/impl/WalletTransactionServiceImpl.java
index 79f0aecb5..45db5fd69 100644
--- a/pjcloud-wallet/pjcloud-wallet-biz/src/main/java/com/bsd/pjcloud/wallet/service/impl/WalletTransactionServiceImpl.java
+++ b/pjcloud-wallet/pjcloud-wallet-biz/src/main/java/com/bsd/pjcloud/wallet/service/impl/WalletTransactionServiceImpl.java
@@ -69,7 +69,7 @@ public class WalletTransactionServiceImpl extends ServiceImpl<WalletTransactionM
 
     @Override
     @Transactional(rollbackFor = Exception.class)
-    @CacheEvict(value = CacheConstants.WALLET_DETAIL, key = "#walletId")
+    // @CacheEvict(value = CacheConstants.WALLET_DETAIL, key = "#walletId")
     public WalletTransactionEntity reduceWalletBalance(Long walletId, Integer price, String bizId, WalletBizEnum bizType) {
         WalletManageEntity wallet = walletManageService.getById(walletId);
         if (ObjectUtil.isEmpty(wallet)) {
@@ -97,7 +97,7 @@ public class WalletTransactionServiceImpl extends ServiceImpl<WalletTransactionM
 
     @Override
     @Transactional(rollbackFor = Exception.class)
-    @CacheEvict(value = CacheConstants.WALLET_DETAIL, key = "#walletId")
+    // @CacheEvict(value = CacheConstants.WALLET_DETAIL, key = "#walletId")
     public WalletTransactionEntity addWalletBalance(Long walletId, Integer price, String bizId, WalletBizEnum bizType) {
         WalletManageEntity wallet = walletManageService.getById(walletId);
         if (ObjectUtil.isEmpty(wallet)) {
@@ -133,7 +133,7 @@ public class WalletTransactionServiceImpl extends ServiceImpl<WalletTransactionM
     }
 
     @Override
-    @CacheEvict(value = CacheConstants.WALLET_DETAIL, key = "#dto.getWalletId()")
+    // @CacheEvict(value = CacheConstants.WALLET_DETAIL, key = "#dto.getWalletId()")
     public Boolean updateWalletBalance(WalletTransactionDto dto) {
         WalletManageEntity wallet = walletManageService.getWallet(dto.getWalletId());
         if (ObjectUtil.isEmpty(wallet)) {