采购付款 问题处理

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

@@ -69,10 +69,6 @@ spring:
                     url: jdbc:mysql://121.37.194.75:30102/bytesailing_ehsd?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=Asia/Shanghai
                     username: root
                     password: 5fWD*oa^nso@kmKa
-                data:
-                    url: jdbc:mysql://121.37.194.75:30102/yf_new?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=Asia/Shanghai
-                    username: root
-                    password: 5fWD*oa^nso@kmKa
                 jxst:
                     url: jdbc:mysql://121.37.194.75:30102/bytesailing_jxst?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=Asia/Shanghai
                     username: root

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

@@ -5,10 +5,6 @@ spring:
             strict: true
             primary: base
             datasource:
-                victoriatourist:
-                    url: jdbc:mysql://127.0.0.1:30102/bytesailing_victoriatourist?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=Asia/Shanghai
-                    username: root
-                    password: 5fWD*oa^nso@kmKa
                 common:
                     url: jdbc:mysql://127.0.0.1:30102/bytesailing_common?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=Asia/Shanghai
                     username: root
@@ -61,18 +57,6 @@ spring:
                     url: jdbc:mysql://127.0.0.1:30102/bytesailing_mail?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=Asia/Shanghai
                     username: root
                     password: 5fWD*oa^nso@kmKa
-                kd100:
-                    url: jdbc:mysql://127.0.0.1:30102/bytesailing_kd100?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=Asia/Shanghai
-                    username: root
-                    password: 5fWD*oa^nso@kmKa
-                ehsd:
-                    url: jdbc:mysql://127.0.0.1:30102/bytesailing_ehsd?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=Asia/Shanghai
-                    username: root
-                    password: 5fWD*oa^nso@kmKa
-                jxst:
-                    url: jdbc:mysql://127.0.0.1:30102/bytesailing_jxst?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=Asia/Shanghai
-                    username: root
-                    password: 5fWD*oa^nso@kmKa
 
     # redis 配置
     redis:

hx-purchase/src/main/resources/mapper/pay/PayDetailMapper.xml

@@ -17,19 +17,22 @@
 
     <select id="getSumMoneyByPurchaseIds" resultType="com.fjhx.purchase.entity.pay.vo.PayDetailVo">
         SELECT
-            purchase_id,
-            IFNULL( SUM( money ), 0 ) AS sumMoney
+        pd.purchase_id,
+        IFNULL( SUM( pd.money ), 0 ) AS sumMoney
         FROM
-            pay_detail
+        pay_detail pd
+        JOIN pay pa ON pd.pay_id = pa.id
         <where>
+            pa.`status` in (10,30,60)
             <if test="purchaseIds neq null and purchaseIds.size() > 0">
-                <foreach collection="purchaseIds" item="purchaseId" open="purchase_id IN (" separator="," close=")">
+                <foreach collection="purchaseIds" item="purchaseId" open="and pd.purchase_id IN (" separator=","
+                         close=")">
                     #{purchaseId}
                 </foreach>
             </if>
         </where>
         GROUP BY
-        purchase_id
+        pd.purchase_id
     </select>
 
     <select id="getPayMoneyCountByPurchaseId" resultType="com.fjhx.purchase.entity.pay.po.PayDetail">