更新！

FullCardServer/src/main/java/com/zhongshu/card/server/core/controller/wallet/WalletController.java

@@ -43,48 +43,4 @@ public class WalletController {
     @Autowired
     AuthHelper authHelper;
 
-    @ResourceAuth(value = "user", type = AuthType.User)
-    @Operation(summary = "初始当前用户钱包")
-    @RequestMapping(value = "initUserWallet", method = {RequestMethod.GET})
-    public ResultContent<Wallet> initUserWallet() {
-        String userId = authHelper.getCurrentUser().getUserId();
-        return walletService.initUserWallet(userId);
-    }
-
-    @ResourceAuth(value = "user", type = AuthType.User)
-    @Operation(summary = "得到当前用户钱包")
-    @RequestMapping(value = "getUserWallet", method = {RequestMethod.GET})
-    public ResultContent<WalletModel> getUserWallet() {
-        String userId = authHelper.getCurrentUser().getUserId();
-        return walletService.getUserWallet(userId);
-    }
-
-    @ResourceAuth(value = "user", type = AuthType.User)
-    @Operation(summary = "当前用户充值")
-    @RequestMapping(value = "rechargeCurrent", method = {RequestMethod.POST})
-    public ResultContent rechargeCurrent(@RequestBody WalletRechargeParam param) {
-        String userId = authHelper.getCurrentUser().getUserId();
-        param.setUserId(userId);
-        return walletService.addWalletRecharge(param);
-    }
-
-    @ResourceAuth(value = "user", type = AuthType.User)
-    @Operation(summary = "得到用户的充值列表", description = "得到用户的充值列表: 如果userId为空，则查询当前用户的")
-    @RequestMapping(value = {"page"}, method = {RequestMethod.POST})
-    public ResultContent<Page<WalletRechargeModel>> page(
-            @Parameter(hidden = true) @PageableDefault(page = 0, size = 10) Pageable pageable,
-            @Parameter(required = false) WalletRechargeSearch param) {
-        if (StringUtils.isEmpty(param.getUserId())) {
-            param.setUserId(authHelper.getCurrentUser().getUserId());
-        }
-        return walletService.page(param, pageable);
-    }
-
-    @ResourceAuth(value = "user", type = AuthType.User)
-    @Operation(summary = "得到充值详情")
-    @RequestMapping(value = "getUserWalletRecharge", method = {RequestMethod.POST})
-    public ResultContent<WalletRechargeModel> getUserWalletRecharge(@RequestBody IDParam param) {
-        return walletService.getUserWalletRecharge(param.getId());
-    }
-
 }

FullCardServer/src/main/java/com/zhongshu/card/server/core/domain/paySetting/ProjectPaySetting.java

@@ -47,6 +47,6 @@ public class ProjectPaySetting extends SuperMain {
     private Object payConfig;
 
     @Schema(description = "是否可用")
-    private DataState state;
+    private DataState state = DataState.Enable;
 
 }

FullCardServer/src/main/java/com/zhongshu/card/server/core/service/devices/DeviceInfoServiceImpl.java

@@ -242,6 +242,23 @@ public class DeviceInfoServiceImpl extends SuperService implements DeviceInfoSer
         return ResultContent.buildSuccess();
     }
 
+    /**
+     * 查询设备所属机构（设备绑定的那个机构）
+     *
+     * @param deviceId
+     * @return
+     */
+    public Organization getDeviceBelongTo(String deviceId) {
+        Organization organization = null;
+        if (StringUtils.isNotEmpty(deviceId)) {
+            DeviceInfo deviceInfo = deviceInfoDao.findTopById(deviceId);
+            if (ObjectUtils.isNotEmpty(deviceInfo)) {
+                organization = deviceInfo.getOrganization();
+            }
+        }
+        return organization;
+    }
+
     /**
      * 设备基础信息
      *

FullCardServer/src/main/java/com/zhongshu/card/server/core/service/devices/DevicePermissIotService.java

@@ -115,6 +115,12 @@ public class DevicePermissIotService {
         return ResultContent.buildSuccess(JSONUtil.toJsonStr(permissModel));
     }
 
+    /**
+     * 查询项目下的用户权限信息 （根据userIds查询）
+     *
+     * @param query
+     * @return
+     */
     public ResultContent getDeviceAboutUserInfos(UserPerQuery query) {
         DeviceUsersInfo permissModel = new DeviceUsersInfo();
         String projectOid = "";

FullCardServer/src/main/java/com/zhongshu/card/server/core/service/paySetting/ProjectChannelConfigService.java

@@ -166,10 +166,23 @@ public class ProjectChannelConfigService extends SuperService {
         return entity;
     }
 
+    /**
+     * 得到支付渠道对应的 支付产品
+     *
+     * @param paymentType
+     * @return
+     */
     public PayChannelConfigModel getProjectPayChannelModel(PaymentType paymentType) {
         return toModel(getProjectPayChannel(paymentType));
     }
 
+    /**
+     * 改变状态
+     *
+     * @param id
+     * @param state
+     * @return
+     */
     public ResultContent changeState(String id, DataState state) {
         PayChannelConfig entity = payChannelConfigDao.findTopById(id);
         if (ObjectUtils.isEmpty(entity)) {
@@ -181,23 +194,26 @@ public class ProjectChannelConfigService extends SuperService {
     }
 
     /**
-     * 所有可用的支付产品
+     * 所有可用的支付产品 (可用的)
      *
      * @return
      */
-    public ResultContent getPlatFormAllPay() {
+    public ResultContent<List<PayChannelConfigModel>> getPlatFormAllPay() {
         List<PayChannelConfigModel> models = new ArrayList<>();
         // 得到平台可用的支付渠道
         List<PayChannelConfig> list = payChannelConfigDao.findByState(DataState.Enable);
         if (ObjectUtils.isNotEmpty(list)) {
-            models = list.stream().map(it -> {
-                PayChannelConfigModel model = new PayChannelConfigModel();
-                return model;
-            }).collect(Collectors.toList());
+            models = list.stream().map(this::toModel).collect(Collectors.toList());
         }
         return ResultContent.buildSuccess(models);
     }
 
+    /**
+     * 转换model
+     *
+     * @param entity
+     * @return
+     */
     public PayChannelConfigModel toModel(PayChannelConfig entity) {
         PayChannelConfigModel model = null;
         if (ObjectUtils.isNotEmpty(entity)) {

FullCardServer/src/main/java/com/zhongshu/card/server/core/service/wallet/WalletService.java

@@ -54,12 +54,13 @@ public class WalletService extends SuperService {
 
     private final ReentrantLock lock = new ReentrantLock();
 
+
     public ResultContent checkUserWallet(String userId, BigDecimal amount) {
         Wallet wallet = getUserWalletByUserId(userId);
         if (wallet.getDataState() != DataState.Enable) {
             return ResultContent.buildFail(String.format("支付失败钱包", wallet.getDataState().getRemark()));
         }
-        if(wallet.getAmount().compareTo(amount) < 0) {
+        if (wallet.getAmount().compareTo(amount) < 0) {
             return ResultContent.buildFail("余额不足");
         }
         return ResultContent.buildSuccess();
@@ -207,7 +208,6 @@ public class WalletService extends SuperService {
     }
 
 
-
     /**
      * 得到充值详情
      *