Bladeren bron

垫款功能,添加端口类型逻辑 bug修复

zhaoxian 2 jaren geleden
bovenliggende
commit
c2035146fb

+ 1 - 1
jeecg-boot-module-system/src/main/java/cn/com/ctop/finance/payment/controller/FinancePaymentApplicationController.java

@@ -78,7 +78,7 @@ public class FinancePaymentApplicationController {
             if ("finance".equals(application.getAuditRole())) {
                 queryWrapper.like("revieweder_id", "financialReview");
             } else {
-                queryWrapper.like("revieweder_id", "meidaManager");
+                queryWrapper.notLike("revieweder_id", "financialReview");
             }
         }
         if (!Check.isNull(application.getAdvertiserName())) {

+ 8 - 3
jeecg-boot-module-system/src/main/java/cn/com/ctop/finance/payment/mapper/xml/FinancePaymentPoolMapper.xml

@@ -79,9 +79,14 @@
             #{item}
         </foreach>
         AND product_id = #{productId}
-        <if test="type!=null ">
-            AND media_id = #{type}
-        </if>
+        <choose>
+          <when test="type != 11 ">
+              AND media_id = #{type}
+          </when>
+          <when test="type == 11 ">
+              AND (media_id = 1 or media_id = 2 )
+          </when>
+        </choose>
     </select>
 
 

+ 3 - 0
jeecg-boot-module-system/src/main/java/cn/com/ctop/finance/payment/mapper/xml/FinancePaymentRechargeApplicationMapper.xml

@@ -94,6 +94,9 @@
             <if test="rechargeType != null and rechargeType != '' ">
                 and t1.recharge_type=#{rechargeType}
             </if>
+            <if test="accountId != null and accountId != '' ">
+                and t2.account_id=#{accountId}
+            </if>
             <if test="startDate != null and startDate != '' ">
                 and t1.create_time >= #{startDate}
                 and t1.create_time &lt;= #{endDate}