xuqiang 1 жил өмнө
parent
commit
29d425475a

+ 1 - 1
src/main/java/com/ydtech/modules/partner/dao/PartnerPremiumDetailsMapper.java

@@ -50,6 +50,6 @@ public interface PartnerPremiumDetailsMapper extends BaseMapper<PartnerPremiumDe
     @Select("SELECT SUM(extract_fee) AS commission FROM partner_premium_details WHERE user_id = #{userId} AND source = #{grade} AND create_time >= #{createTime}")
     BigDecimal commissionAfterUserLocking(@Param("userId") String userId,@Param("grade") Integer grade,@Param("createTime") Date createTime);
 
-    @Select("UPDATE partner_user SET app_status = #{status} WHERE grade = #{originalLevel} AND user_id = #{userId} AND create_time BETWEEN DATE_FORMAT(identityTime, '%Y-%m-%d 00:00:00') AND TIMESTAMP(DATE(NOW()), '23:59:59') ")
+    @Select("UPDATE partner_premium_details SET app_status = #{status} WHERE source = #{originalLevel} AND user_id = #{userId} AND create_time BETWEEN DATE_FORMAT(#{identityTime}, '%Y-%m-%d 00:00:00') AND TIMESTAMP(DATE(NOW()), '23:59:59') ")
     void updateAppStatus(@Param("originalLevel") String originalLevel,@Param("userId") String userId, @Param("status")int status, @Param("identityTime")Date identityTime);
 }

+ 1 - 1
src/main/resources/mapper/modules/admin/SysPartnerAccountMapper.xml

@@ -73,7 +73,7 @@
             COALESCE(SUM(CASE WHEN 1=1 THEN extract_fee END), 0) AS totalAmount,
             COALESCE(SUM(CASE WHEN 1=1 THEN history_fee END), 0) AS transferAmount,
             COALESCE(SUM(CASE WHEN 1=1 THEN expired_amount END), 0) AS expiredAmount,
-            COALESCE(SUM(CASE WHEN 1=1 THEN cash_fee END), 0) AS unreportedAmount,
+            COALESCE(SUM(CASE WHEN 1=1 THEN cash_fee - expired_amount END), 0) AS unreportedAmount,
             (SELECT COALESCE(cash_fee, 0) FROM sys_partner_account WHERE user_id = #{userId}) AS cashFee,
             (SELECT COALESCE(history_fee, 0) FROM sys_partner_account WHERE user_id = #{userId} ) AS historyFee
         FROM partner_partner_account