充值

njzscloud-svr/src/main/java/com/njzscloud/supervisory/money/controller/MoneyAccountController.java

@@ -1,5 +1,6 @@
 package com.njzscloud.supervisory.money.controller;
 
+import com.njzscloud.common.core.ex.Exceptions;
 import com.njzscloud.common.core.utils.R;
 import com.njzscloud.common.mp.support.PageParam;
 import com.njzscloud.common.mp.support.PageResult;
@@ -37,6 +38,10 @@ public class MoneyAccountController {
      */
     @PostMapping("/modify")
     public R<?> modify(@RequestBody MoneyAccountEntity moneyAccountEntity) {
+        if (moneyAccountEntity.getRechargeMoney() == null || moneyAccountEntity.getRechargeMoney().signum() <= 0) {
+            throw Exceptions.clierr("充值金额需大于0");
+        }
+        moneyAccountEntity.setMoney(moneyAccountEntity.getMoney().add(moneyAccountEntity.getRechargeMoney()));
         moneyAccountService.modify(moneyAccountEntity);
         return R.success();
     }
@@ -54,7 +59,7 @@ public class MoneyAccountController {
      * 详情
      */
     @GetMapping("/detail")
-    public R<MoneyAccountEntity> detail(@RequestParam Long id) {
+    public R<MoneyAccountResult> detail(@RequestParam Long id) {
         return R.success(moneyAccountService.detail(id));
     }
 

njzscloud-svr/src/main/java/com/njzscloud/supervisory/money/mapper/MoneyAccountMapper.java

@@ -19,4 +19,9 @@ public interface MoneyAccountMapper extends BaseMapper<MoneyAccountEntity> {
      */
     IPage<MoneyAccountResult> selectMoneyAccountWithName(Page<MoneyAccountResult> page, @Param("entity") MoneyAccountEntity entity);
 
+    /**
+     * 根据ID查询资金账户详情（包含关联信息）
+     */
+    MoneyAccountResult selectMoneyAccountDetailById(@Param("id") Long id);
+
 }

njzscloud-svr/src/main/java/com/njzscloud/supervisory/money/pojo/entity/MoneyAccountEntity.java

@@ -58,4 +58,9 @@ public class MoneyAccountEntity {
     @TableField(exist = false)
     private Integer moneyType;
 
+    /**
+     * 充值金额 > 0
+     */
+    @TableField(exist = false)
+    private BigDecimal rechargeMoney;
 }

njzscloud-svr/src/main/java/com/njzscloud/supervisory/money/service/MoneyAccountService.java

@@ -49,8 +49,8 @@ public class MoneyAccountService extends ServiceImpl<MoneyAccountMapper, MoneyAc
     /**
      * 详情
      */
-    public MoneyAccountEntity detail(Long id) {
+    public MoneyAccountResult detail(Long id) {
-        return this.getById(id);
+        return baseMapper.selectMoneyAccountDetailById(id);
     }
 
     /**

njzscloud-svr/src/main/java/com/njzscloud/supervisory/sys/bulletin/pojo/BulletinEntity.java

@@ -67,4 +67,9 @@ public class BulletinEntity {
     @TableLogic
     private Boolean deleted;
 
+    /**
+     * 内容
+     */
+    private String content;
+
 }

njzscloud-svr/src/main/resources/mapper/money/MoneyAccountMapper.xml

@@ -45,4 +45,27 @@
         ORDER BY ma.modify_time DESC
     </select>
 
+    <select id="selectMoneyAccountDetailById" resultType="com.njzscloud.supervisory.money.pojo.result.MoneyAccountResult">
+        SELECT
+            ma.id,
+            ma.user_id as userId,
+            ma.station_id as stationId,
+            ma.money,
+            ma.modify_time as modifyTime,
+            CASE
+                WHEN ma.user_id IS NOT NULL THEN u.nickname
+                WHEN ma.station_id IS NOT NULL THEN bc.company_name
+                ELSE NULL
+                END as name,
+            CASE
+                WHEN ma.user_id IS NOT NULL THEN 1
+                WHEN ma.station_id IS NOT NULL THEN 2
+                ELSE NULL
+                END as moneyType
+        FROM money_account ma
+                 LEFT JOIN sys_user u ON ma.user_id = u.id
+                 LEFT JOIN biz_company bc ON ma.station_id = bc.id AND bc.station = 1
+        WHERE ma.id = #{id}
+    </select>
+
 </mapper>