代理人3.0app开发

src/main/java/com/ydtech/modules/partner/controller/PartnerExtractHistoryController.java

@@ -146,7 +146,7 @@ public class PartnerExtractHistoryController extends BaseController {
             JSONObject jsonObject = new JSONObject();
             jsonObject.put("grade", entry.getKey().toString());
             if (null != lockCommission){
-                jsonObject.put("cashFee", entry.getValue().subtract(lockCommission));
+                jsonObject.put("cashFee", entry.getValue().subtract(lockCommission).toString());
             }else {
                 jsonObject.put("cashFee", entry.getValue().toString());
             }

src/main/java/com/ydtech/modules/partner/dao/PartnerPremiumDetailsMapper.java

@@ -47,7 +47,7 @@ public interface PartnerPremiumDetailsMapper extends BaseMapper<PartnerPremiumDe
     List<Map<String,Object>> selectCombinedStatistics(@Param("ew")QueryWrapper<PartnerPremiumDetails> wrapper);
 
 
-    @Select("SELECT SUM(extract_fee) AS commission FROM partner_premium_details WHERE user_id = #{userId} AND source = #{grade} AND create_time >= #{createTime}")
+    @Select("SELECT SUM(extract_fee) AS commission FROM partner_premium_details WHERE app_status = 1 AND 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_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') ")

src/main/java/com/ydtech/modules/partner/service/Impl/PartnerUserServiceImpl.java

@@ -322,7 +322,7 @@ public class PartnerUserServiceImpl extends ServiceImpl<PartnerUserMapper, Partn
                         BigDecimal lockCommission = liftingRecordService.queryLockCommission(partnerUser.getUserId(), String.valueOf(partnerUser.getGrade()));
                         PartnerRuleEntity rule = partnerRuleService.selectByGrade(overviewVo.getGrade());
                         if (null != lockCommission && null !=  rule.getFallAmount()){
-                            overviewVo.setFallAmount(lockCommission.multiply(rule.getFallAmount()).setScale(2, RoundingMode.HALF_UP));
+                            overviewVo.setFallAmount(lockCommission.multiply(rule.getFallAmount().divide(new BigDecimal("100"))).setScale(2, RoundingMode.HALF_UP));
                         }else {
                             overviewVo.setFallAmount(BigDecimal.ZERO);
                         }
@@ -547,18 +547,10 @@ public class PartnerUserServiceImpl extends ServiceImpl<PartnerUserMapper, Partn
         lambdaQueryWrapper.eq(PartnerPartnerAccount::getGrade,params.getGrade());
         //PartnerPartnerAccount account = partnerPartnerAccountMapper.selectOne(lambdaQueryWrapper);
         PartnerPartnerAccount account = partnerPartnerAccountMapper.selectStatisticalData(params);
-        PartnerUser partnerUser = baseMapper.selectOne(new LambdaQueryWrapper<>(PartnerUser.class).eq(PartnerUser::getUserId, params.getUserId()).eq(PartnerUser::getGrade, params.getGrade()));
         if (account == null){
             account = new PartnerPartnerAccount();
         }else {
-            account.setCashFee(account.getExtractFee().subtract(account.getHistoryFee()).subtract(account.getExpired()));
-            if (null != partnerUser && partnerUser.isIdentityStatus()){
-                BigDecimal lockCommission = liftingRecordService.queryLockCommission(params.getUserId(), params.getGrade());
-                account.setFreeze(lockCommission);
-                if (null != lockCommission) {
-                    account.setCashFee(account.getCashFee().subtract(lockCommission));
-                }
-            }
+            account.setCashFee(account.getExtractFee().subtract(account.getHistoryFee()).subtract(account.getExpired()).subtract(account.getFreeze()));
         }
         return HttpResult.ok(account);
     }

src/main/resources/mapper/modules/partner/PartnerPartnerAccountMapper.xml

@@ -21,13 +21,13 @@
                                 <if test="params.startTime != null and params.endTime != null">
                                     AND DATE(create_time) BETWEEN #{params.startTime} AND #{params.endTime}
                                 </if>
-                       ),0) freeze,
+                       ),0) expired,
                 ifnull((
                            SELECT SUM(extract_fee) FROM partner_premium_details WHERE user_id = #{params.userId} AND source = #{params.grade} AND app_status = 2
                                 <if test="params.startTime != null and params.endTime != null">
                                     AND DATE(create_time) BETWEEN #{params.startTime} AND #{params.endTime}
                                 </if>
-                       ),0) expired,
+                       ),0) freeze,
                 ifnull((
                             SELECT SUM(amount) FROM partner_extract_history  WHERE user_id = #{params.userId} AND grade = #{params.grade}
                             <if test="params.startTime != null and params.endTime != null">