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

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

@@ -7,6 +7,7 @@ import com.njzscloud.supervisory.biz.constant.AuditStatus;
 import com.njzscloud.supervisory.biz.pojo.entity.BizCompanyEntity;
 import com.njzscloud.supervisory.biz.pojo.param.ModifyBizCompanyParam;
 import com.njzscloud.supervisory.biz.pojo.param.SearchCompanyParam;
+import com.njzscloud.supervisory.biz.pojo.param.SettlementWayParam;
 import com.njzscloud.supervisory.biz.pojo.result.SearchCompanyResult;
 import com.njzscloud.supervisory.biz.pojo.result.StationResult;
 import com.njzscloud.supervisory.biz.service.BizCompanyService;
@@ -47,6 +48,20 @@ public class BizCompanyController {
         return R.success();
     }
 
+    /**
+     * 修改结算方式
+     *
+     * @param settlementWayParam 数据
+     */
+    @PostMapping("/updateSettlementWay")
+    public R<?> updateSettlementWay(@RequestBody SettlementWayParam settlementWayParam) {
+        BizCompanyEntity entity = new BizCompanyEntity();
+        entity.setId(settlementWayParam.getId());
+        entity.setSettlementWay(settlementWayParam.getSettlementWay());
+        bizCompanyService.updateById(entity);
+        return R.success();
+    }
+
     /**
      * 撤销
      *

njzscloud-svr/src/main/java/com/njzscloud/supervisory/biz/pojo/entity/BizCompanyEntity.java

@@ -183,4 +183,9 @@ public class BizCompanyEntity {
     @TableField(exist = false)
     private BizObj bizObj;
 
+    /**
+     * 结算方式
+     */
+    private String settlementWay;
+
 }

njzscloud-svr/src/main/java/com/njzscloud/supervisory/biz/pojo/param/SettlementWayParam.java

@@ -0,0 +1,27 @@
+package com.njzscloud.supervisory.biz.pojo.param;
+
+import lombok.Getter;
+import lombok.Setter;
+import lombok.ToString;
+import lombok.experimental.Accessors;
+
+/**
+ * 企业信息
+ */
+@Getter
+@Setter
+@ToString
+@Accessors(chain = true)
+public class SettlementWayParam {
+
+    /**
+     * Id
+     */
+    private Long id;
+
+    /**
+     * 结算方式
+     */
+    private String settlementWay;
+
+}

njzscloud-svr/src/main/java/com/njzscloud/supervisory/customer/pojo/result/SearchCustomerResult.java

@@ -59,4 +59,6 @@ public class SearchCustomerResult {
      * 公司信息
      */
     private SearchCompanyResult company;
+
+    private String settlementWay;
 }

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

@@ -4,6 +4,7 @@ import com.njzscloud.common.core.utils.R;
 import com.njzscloud.common.mp.support.PageParam;
 import com.njzscloud.common.mp.support.PageResult;
 import com.njzscloud.supervisory.money.pojo.entity.MoneyBillEntity;
+import com.njzscloud.supervisory.money.pojo.param.RebuildBillParam;
 import com.njzscloud.supervisory.money.service.MoneyBillService;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
@@ -65,4 +66,13 @@ public class MoneyBillController {
         return R.success(moneyBillService.paging(pageParam, moneyBillEntity));
     }
 
+    /**
+     * 重新生成账单
+     */
+    @PostMapping("/rebuildBill")
+    public R<?> rebuildBill(@RequestBody RebuildBillParam param) {
+        moneyBillService.rebuildBill(param);
+        return R.success();
+    }
+
 }

njzscloud-svr/src/main/java/com/njzscloud/supervisory/money/pojo/param/RebuildBillParam.java

@@ -0,0 +1,18 @@
+package com.njzscloud.supervisory.money.pojo.param;
+
+import lombok.Data;
+
+@Data
+public class RebuildBillParam {
+
+    /**
+     * 公司id
+     */
+    private Long companyId;
+
+    /**
+     * 源付费项id
+     */
+    private Long originExpenseItemId;
+
+}

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

@@ -7,6 +7,7 @@ import com.njzscloud.common.mp.support.PageParam;
 import com.njzscloud.common.mp.support.PageResult;
 import com.njzscloud.supervisory.money.mapper.MoneyBillMapper;
 import com.njzscloud.supervisory.money.pojo.entity.MoneyBillEntity;
+import com.njzscloud.supervisory.money.pojo.param.RebuildBillParam;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
@@ -58,4 +59,11 @@ public class MoneyBillService extends ServiceImpl<MoneyBillMapper, MoneyBillEnti
         return PageResult.of(result);
     }
 
+    /**
+     * 重新生成账单
+     */
+    public void rebuildBill(RebuildBillParam param) {
+        return;
+    }
+
 }

njzscloud-svr/src/main/resources/mapper/customer/CustomerMapper.xml

@@ -45,7 +45,8 @@
         c.contacts,
         c.phone contacts_phone,
         c.audit_status,
-        c.audit_memo
+        c.audit_memo,
+        c.settlement_way
         FROM sys_user a
         INNER JOIN sys_user_account b ON b.user_id = a.id AND b.deleted = 0
         LEFT JOIN biz_company c ON c.user_id = a.id AND c.station = 0 AND c.deleted = 0

njzscloud-svr/src/main/resources/mapper/sys/auth/AuthMapper.xml

@@ -108,7 +108,7 @@
         FROM
             biz_company bc
             LEFT JOIN money_account ma ON bc.id = ma.station_id
-        WHERE user_id = #{userId}
+        WHERE bc.user_id = #{userId}
     </select>
 
     <select id="selectWechatOpenidByUserId" resultType="java.lang.String">