Merge branch 'master' of https://git.njzscloud.com/lzq/njzscloud

njzscloud-svr/src/main/java/com/njzscloud/supervisory/biz/controller/BizCompanyController.java

@@ -26,6 +26,15 @@ public class BizCompanyController {
 
     private final BizCompanyService bizCompanyService;
 
+    /**
+     * 新增站点
+     */
+    @PostMapping("/addStation")
+    public R<?> add(@RequestBody BizCompanyEntity entity) {
+        bizCompanyService.addStation(entity);
+        return R.success();
+    }
+
     /**
      * 修改
      *

njzscloud-svr/src/main/java/com/njzscloud/supervisory/biz/service/BizCompanyService.java

@@ -50,6 +50,16 @@ public class BizCompanyService extends ServiceImpl<BizCompanyMapper, BizCompanyE
         this.save(bizCompanyEntity);
     }
 
+    /**
+     * 新增
+     *
+     * @param bizCompanyEntity 数据
+     */
+    public void addStation(BizCompanyEntity bizCompanyEntity) {
+        bizCompanyEntity.setStation(true);
+        this.save(bizCompanyEntity);
+    }
+
     @Transactional(rollbackFor = Exception.class)
     public void add(AddBizCompanyParam addBizCompanyParam) {
         AppProperties.DefaultPlace defaultPlace = appProperties.getDefaultPlace();

njzscloud-svr/src/main/java/com/njzscloud/supervisory/money/pojo/result/MoneyAccountResult.java

@@ -0,0 +1,55 @@
+package com.njzscloud.supervisory.money.pojo.result;
+
+import lombok.Getter;
+import lombok.Setter;
+import lombok.ToString;
+import lombok.experimental.Accessors;
+
+import java.math.BigDecimal;
+import java.time.LocalDateTime;
+
+/**
+ * 资金账户查询结果
+ */
+@Getter
+@Setter
+@ToString
+@Accessors(chain = true)
+public class MoneyAccountResult {
+
+    /**
+     * Id
+     */
+    private Long id;
+
+    /**
+     * 归属用户 Id; 普通用户时不为空
+     */
+    private Long userId;
+
+    /**
+     * 归属站点 Id; 平台站点时不为空
+     */
+    private Long stationId;
+
+    /**
+     * 资金
+     */
+    private BigDecimal money;
+
+    /**
+     * 修改时间
+     */
+    private LocalDateTime modifyTime;
+
+    /**
+     * 名称（用户昵称或公司名称）
+     */
+    private String name;
+
+    /**
+     * 资金类型：1为用户，2为平台
+     */
+    private Integer moneyType;
+
+}