file

hx-account/src/main/java/com/fjhx/account/entity/account/vo/AccountRunningWaterVo.java

@@ -107,4 +107,10 @@ public class AccountRunningWaterVo extends AccountRunningWater {
      * 往来部门名称
      */
     private String transactionDeptName;
+
+    /**
+     * 是否参与结算
+     */
+    private Integer isCompute;
+
 }

hx-admin/src/main/resources/application-prod.yml

@@ -1,111 +1,112 @@
 # 数据源配置
 spring:
-    datasource:
-        dynamic:
-            strict: true
-            primary: base
-            datasource:
-                victoriatourist:
-                  url: jdbc:mysql://192.168.0.238:23063/bytesailing_victoriatourist?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=Asia/Shanghai
-                  username: bytesailing_db_user
-                  password: kfG-A93-w7h-qX8
-                common:
-                  url: jdbc:mysql://192.168.0.238:23063/bytesailing_common?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=Asia/Shanghai
-                  username: bytesailing_db_user
-                  password: kfG-A93-w7h-qX8
-                oa:
-                  url: jdbc:mysql://192.168.0.238:23063/bytesailing_oa?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=Asia/Shanghai
-                  username: bytesailing_db_user
-                  password: kfG-A93-w7h-qX8
-                mes:
-                  url: jdbc:mysql://192.168.0.238:23063/bytesailing_mes?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=Asia/Shanghai
-                  username: bytesailing_db_user
-                  password: kfG-A93-w7h-qX8
-                wms:
-                  url: jdbc:mysql://192.168.0.238:23063/bytesailing_wms?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=Asia/Shanghai
-                  username: bytesailing_db_user
-                  password: kfG-A93-w7h-qX8
-                item:
-                  url: jdbc:mysql://192.168.0.238:23063/bytesailing_item?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=Asia/Shanghai
-                  username: bytesailing_db_user
-                  password: kfG-A93-w7h-qX8
-                supply:
-                  url: jdbc:mysql://192.168.0.238:23063/bytesailing_supply?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=Asia/Shanghai
-                  username: bytesailing_db_user
-                  password: kfG-A93-w7h-qX8
-                base:
-                  url: jdbc:mysql://192.168.0.238:23063/bytesailing_base?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=Asia/Shanghai
-                  username: bytesailing_db_user
-                  password: kfG-A93-w7h-qX8
-                iot:
-                  url: jdbc:mysql://192.168.0.238:23063/bytesailing_iot?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=Asia/Shanghai
-                  username: bytesailing_db_user
-                  password: kfG-A93-w7h-qX8
-                customer:
-                  url: jdbc:mysql://192.168.0.238:23063/bytesailing_customer?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=Asia/Shanghai
-                  username: bytesailing_db_user
-                  password: kfG-A93-w7h-qX8
-                purchase:
-                  url: jdbc:mysql://192.168.0.238:23063/bytesailing_purchase?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=Asia/Shanghai
-                  username: bytesailing_db_user
-                  password: kfG-A93-w7h-qX8
-                account:
-                  url: jdbc:mysql://192.168.0.238:23063/bytesailing_account?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=Asia/Shanghai
-                  username: bytesailing_db_user
-                  password: kfG-A93-w7h-qX8
-                sale:
-                  url: jdbc:mysql://192.168.0.238:23063/bytesailing_sale?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=Asia/Shanghai
-                  username: bytesailing_db_user
-                  password: kfG-A93-w7h-qX8
-                mail:
-                  url: jdbc:mysql://192.168.0.238:23063/bytesailing_mail?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=Asia/Shanghai
-                  username: bytesailing_db_user
-                  password: kfG-A93-w7h-qX8
-                kd100:
-                  url: jdbc:mysql://192.168.0.238:23063/bytesailing_kd100?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=Asia/Shanghai
-                  username: bytesailing_db_user
-                  password: kfG-A93-w7h-qX8
+  datasource:
+    dynamic:
+      strict: true
+      primary: base
+      datasource:
+        victoriatourist:
+          url: jdbc:mysql://192.168.0.238:23063/bytesailing_victoriatourist?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=Asia/Shanghai
+          username: bytesailing_db_user
+          password: kfG-A93-w7h-qX8
+        common:
+          url: jdbc:mysql://192.168.0.238:23063/bytesailing_common?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=Asia/Shanghai
+          username: bytesailing_db_user
+          password: kfG-A93-w7h-qX8
+        oa:
+          url: jdbc:mysql://192.168.0.238:23063/bytesailing_oa?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=Asia/Shanghai
+          username: bytesailing_db_user
+          password: kfG-A93-w7h-qX8
+        mes:
+          url: jdbc:mysql://192.168.0.238:23063/bytesailing_mes?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=Asia/Shanghai
+          username: bytesailing_db_user
+          password: kfG-A93-w7h-qX8
+        wms:
+          url: jdbc:mysql://192.168.0.238:23063/bytesailing_wms?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=Asia/Shanghai
+          username: bytesailing_db_user
+          password: kfG-A93-w7h-qX8
+        item:
+          url: jdbc:mysql://192.168.0.238:23063/bytesailing_item?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=Asia/Shanghai
+          username: bytesailing_db_user
+          password: kfG-A93-w7h-qX8
+        supply:
+          url: jdbc:mysql://192.168.0.238:23063/bytesailing_supply?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=Asia/Shanghai
+          username: bytesailing_db_user
+          password: kfG-A93-w7h-qX8
+        base:
+          url: jdbc:mysql://192.168.0.238:23063/bytesailing_base?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=Asia/Shanghai
+          username: bytesailing_db_user
+          password: kfG-A93-w7h-qX8
+        iot:
+          url: jdbc:mysql://192.168.0.238:23063/bytesailing_iot?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=Asia/Shanghai
+          username: bytesailing_db_user
+          password: kfG-A93-w7h-qX8
+        customer:
+          url: jdbc:mysql://192.168.0.238:23063/bytesailing_customer?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=Asia/Shanghai
+          username: bytesailing_db_user
+          password: kfG-A93-w7h-qX8
+        purchase:
+          url: jdbc:mysql://192.168.0.238:23063/bytesailing_purchase?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=Asia/Shanghai
+          username: bytesailing_db_user
+          password: kfG-A93-w7h-qX8
+        account:
+          url: jdbc:mysql://192.168.0.238:23063/bytesailing_account?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=Asia/Shanghai
+          username: bytesailing_db_user
+          password: kfG-A93-w7h-qX8
+        sale:
+          url: jdbc:mysql://192.168.0.238:23063/bytesailing_sale?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=Asia/Shanghai
+          username: bytesailing_db_user
+          password: kfG-A93-w7h-qX8
+        mail:
+          url: jdbc:mysql://192.168.0.238:23063/bytesailing_mail?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=Asia/Shanghai
+          username: bytesailing_db_user
+          password: kfG-A93-w7h-qX8
+        kd100:
+          url: jdbc:mysql://192.168.0.238:23063/bytesailing_kd100?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=Asia/Shanghai
+          username: bytesailing_db_user
+          password: kfG-A93-w7h-qX8
 
-    # redis 配置
-    redis:
-        # 地址
-        host: 127.0.0.1
-        # 端口，默认为6379
-        port: 31347
-        # 数据库索引
-        database: 1
-        # 密码
-        password: w3G_11h4YjrsO_6P5Oi
-        # 连接超时时间
-        timeout: 10s
-        lettuce:
-            pool:
-                # 连接池中的最小空闲连接
-                min-idle: 0
-                # 连接池中的最大空闲连接
-                max-idle: 8
-                # 连接池的最大数据库连接数
-                max-active: 8
-                # #连接池最大阻塞等待时间（使用负值表示没有限制）
-                max-wait: -1ms
+  # redis 配置
+  redis:
+    # 地址
+    host: 127.0.0.1
+    # 端口，默认为6379
+    port: 9673
+    # 数据库索引
+    database: 1
+    # 密码
+    password: ss34dsA3DdsF
+    # 连接超时时间
+    timeout: 10s
+    lettuce:
+      pool:
+        # 连接池中的最小空闲连接
+        min-idle: 0
+        # 连接池中的最大空闲连接
+        max-idle: 8
+        # 连接池的最大数据库连接数
+        max-active: 8
+        # #连接池最大阻塞等待时间（使用负值表示没有限制）
+        max-wait: -1ms
 
 server:
-    servlet:
-        context-path: /prod-api
+  port: 9910
+  servlet:
+    context-path: /prod-api
 
 mail:
-    # 调用邮箱服务url前缀
-    urlPrefix: http://localhost:8088/mailService/
-    abroadUrlPrefix: http://159.138.54.234:8088/mailService/
+  # 调用邮箱服务url前缀
+  urlPrefix: http://localhost:8088/mailService/
+  abroadUrlPrefix: http://159.138.54.234:8088/mailService/
 
 hx:
-    httpUrl: http://139.159.251.109:81/prod-api/
+  httpUrl: http://139.159.251.109:81/prod-api/
 
 # token配置
 token:
-    # 令牌自定义标识
-    header: Authorization
-    # 令牌密钥
-    secret: abcdefghijklmnopqrstuvwxyz
-    # 令牌有效期（默认30分钟）
-    expireTime: 240
+  # 令牌自定义标识
+  header: Authorization
+  # 令牌密钥
+  secret: abcdefghijklmnopqrstuvwxyz
+  # 令牌有效期（默认30分钟）
+  expireTime: 240

hx-admin/src/main/resources/application.yml

@@ -18,7 +18,7 @@ ruoyi:
 # 开发环境配置
 server:
   # 服务器的HTTP端口，默认为8080
-  port: 9898
+  port: 9910
   tomcat:
     # tomcat的URI编码
     uri-encoding: UTF-8

hx-sale/src/main/java/com/fjhx/sale/service/statement/impl/SaleStatementServiceImpl.java

@@ -78,7 +78,7 @@ public class SaleStatementServiceImpl implements SaleStatementService {
     public Page<ProfitSettlementVo> getProfitSettlement(ProfitSettlementDto dto) {
         Page<ContractVo> contractPage = contractService.getProfitSettlement(dto);
         List<ContractVo> records = contractPage.getRecords();
-        if (records.size() == 0) {
+        if (records.isEmpty()) {
             return new Page<>();
         }
         // 转换为vo

hx-sale/src/main/resources/mapper/commission/CommissionMapper.xml

@@ -16,7 +16,8 @@
             IFNULL( SUM( public_amount ), 0 ) AS publicAmount,
             IFNULL( SUM( have_overall_amount ), 0 ) AS haveOverallAmount,
             IFNULL( SUM( departmental_commission ), 0 ) AS departmentalCommission,
-            IFNULL( SUM( personal_commission ), 0 ) AS personalCommission
+            IFNULL( SUM( personal_commission ), 0 ) AS personalCommission,
+            IFNULL( SUM( contract_arrival ), 0 ) AS contract_arrival
         FROM
             commission c
             ${ew.customSqlSegment}

hx-sale/src/main/resources/mapper/contract/ContractMapper.xml

@@ -24,28 +24,22 @@
     </select>
 
     <select id="getProfitSettlement" resultType="com.fjhx.sale.entity.contract.vo.ContractVo">
-        SELECT
-            *
-        FROM
-            (
-            SELECT *
-            FROM
-                (SELECT t1.*,
-                        CASE
-                            WHEN ( IFNULL( t1.amount, 0 ) * IFNULL( t1.advance_ratio / 100, 0 ) - t1.sumClaimMoney ) &lt;=  0 THEN
-                                20
-                            WHEN t1.sumClaimMoney = 0 THEN
-                                0
-                            ELSE 10
-                            END                                   AS refundStatusNew
-                 FROM (SELECT t1.*,
-                              (SELECT IFNULL(SUM(IFNULL(cc.money, 0) * IFNULL(arw.rate, 1)), 0)
-                               FROM claim_contract cc
-                                        left join claim c on cc.claim_id = c.id
-                                        LEFT JOIN bytesailing_account.account_running_water arw on c.business_id = arw.id
-                               WHERE cc.contract_id = t1.id) AS sumClaimMoney
-                       FROM contract t1) t1) t1
-                ) t1
+        SELECT *
+        FROM (SELECT t1.*,
+                     CASE
+                         WHEN (IFNULL(t1.amount, 0) * IFNULL(t1.advance_ratio / 100, 0) - t1.sumClaimMoney) &lt;= 0 THEN
+                             20
+                         WHEN t1.sumClaimMoney = 0 THEN
+                             0
+                         ELSE 10
+                         END AS refundStatusNew
+              FROM (SELECT t1.*,
+                           (SELECT IFNULL(SUM(IFNULL(cc.money, 0) * IFNULL(arw.rate, 1)), 0)
+                            FROM claim_contract cc
+                                     left join claim c on cc.claim_id = c.id
+                                     LEFT JOIN bytesailing_account.account_running_water arw on c.business_id = arw.id
+                            WHERE cc.contract_id = t1.id) AS sumClaimMoney
+                    FROM contract t1) t1) t1
             ${ew.customSqlSegment}
     </select>
     <select id="getProfitSettlementHead" resultType="com.fjhx.sale.entity.contract.vo.ContractVo">
@@ -204,9 +198,11 @@
                  LEFT JOIN bytesailing_item.product_info pi ON cp.product_id = pi.id
             ${ew.customSqlSegment}
     </select>
+
     <select id="getAccountRunningWaterByContractId"
             resultType="com.fjhx.account.entity.account.vo.AccountRunningWaterVo">
         SELECT arw.id,
+               arw.is_compute,
                arw.create_time,
                ap.type,
                arw.currency,
@@ -227,6 +223,7 @@
         WHERE c.id = #{contractId}
         UNION ALL
         SELECT arw.id,
+               arw.is_compute,
                arw.create_time,
                ap.type,
                arw.currency,
@@ -248,6 +245,7 @@
         group by arfd.id
         UNION ALL
         SELECT arw.id,
+               arw.is_compute,
                arw.create_time,
                30                 type,
                arw.currency,
@@ -267,6 +265,7 @@
           AND c.id = #{contractId}
         UNION ALL
         SELECT arw.id,
+               arw.is_compute,
                arw.create_time,
                40 AS              type,
                arw.currency,