实收接口优化

src/main/java/com/ydtech/modules/admin/controller/SysUserAccountController.java

@@ -9,7 +9,6 @@ import com.ydtech.modules.admin.service.SysUserAccountService;
 import com.ydtech.modules.base.controller.BaseController;
 import com.ydtech.modules.order.entity.BasePageResult;
 import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiModelProperty;
 import io.swagger.annotations.ApiOperation;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -46,17 +45,33 @@ public class SysUserAccountController extends BaseController {
     }
 
     @GetMapping(value = "/getSysAllAmount")
-    @ApiModelProperty("用户余额new")
+    @ApiOperation("用户余额new")
     public HttpResult<SysUserAccountVo>  getSysAllAmount (){
         String   userId = BaseController.getUser().getId();
         SysUserAccountVo result = sysUserAccountService.getSysAllAmount(userId);
         return  HttpResult.ok("success", result);
     }
     @PostMapping("getInsOrders")
-    @ApiOperation("获取子订单号")
+    @ApiOperation("获取预收实收列表数据")
     public HttpResult<SysUserAccountVo>  getInsOrders(@RequestBody SysUserAccountVo sysUserAccountVo){
-        SysUserAccountVo result =sysUserAccountService.getInsOrders(sysUserAccountVo);
-        return  HttpResult.ok("success", result);
+
+        if(StringUtils.isBlank(sysUserAccountVo.getAmountType())){
+            return HttpResult.error("金额类型（手续费金额1跟单金额2推广金额3）amountType不能为空");
+        }
+        //预收实收类型
+        if(StringUtils.isBlank(sysUserAccountVo.getSearchType())){
+            return HttpResult.error("预收实收类型（预收1实收2）searchType不能为空");
+        }
+        //查询时间
+        if(StringUtils.isBlank(sysUserAccountVo.getTimeFiltering())){
+            return HttpResult.error("查询时间timeFiltering不能为空");
+        }
+        try{
+            SysUserAccountVo result =sysUserAccountService.getInsOrders(sysUserAccountVo);
+            return  HttpResult.ok("success", result);
+        }catch (Exception e){
+            return HttpResult.error("查询失败"+e.getMessage());
+        }
     }
     /**
      *  @version

src/main/java/com/ydtech/modules/admin/model/vo/SysUserAccountVo.java

@@ -138,11 +138,11 @@ public class SysUserAccountVo {
     private String  timeFiltering;
     @ApiModelProperty("子订单数组")
     private List<InsFeeOrderNew> insFeeOrderNewList;
-    @ApiModelProperty("金额类型")
+    @ApiModelProperty("金额类型 1. 手续费金额 2. 跟单金额  3. 推广金额")
     private String  amountType;
     //添加预收和实收前台逻辑的判断  add by hxl   2024-06-03
     @ApiModelProperty("预收和实收的判断区分 预收是1  实收是2")
-    private String  auditingStatus;
+    private String  searchType;
 
 
 }

src/main/java/com/ydtech/modules/admin/service/impl/SysUserAccountServiceImpl.java

@@ -294,7 +294,6 @@ public class SysUserAccountServiceImpl extends ServiceImpl<SysUserAccountMapper,
         BigDecimal receivedWillHalding = BigDecimal.ZERO;        //实收手续费佣金
         BigDecimal receivedWillDocumentary = BigDecimal.ZERO;   //实收非跟单佣金
         BigDecimal receivedWillPromotion = BigDecimal.ZERO;   //实收推广费
-        StringBuffer stringBuffer = new StringBuffer();
         // 预收手续费佣金
         willPromotion = this.willPromotionAll(willPromotion, userId,"1");
         // 实收手续费佣金
@@ -302,7 +301,6 @@ public class SysUserAccountServiceImpl extends ServiceImpl<SysUserAccountMapper,
         // add by   hxl  修改sql 添加承保状态和不在审核表中的条件   begin ===============
         List<InsFeeOrderNew> willList = insFeeOrderNewService.getByUserIdAndOrderStatusAndNoCheckType(userId,"1");
         List<InsFeeOrderNew> willListnew = insFeeOrderNewService.getByUserIdAndOrderStatusAndNoCheckType(userId,"2");
-        //  add by  hxl   end ==========================
         if (!CollectionUtils.isEmpty(willList)) {
             for (InsFeeOrderNew item : willList) {
                 if (ObjectUtils.isNotEmpty(item)) {
@@ -312,7 +310,6 @@ public class SysUserAccountServiceImpl extends ServiceImpl<SysUserAccountMapper,
                 }
             }
         }
-
         if (!CollectionUtils.isEmpty(willListnew)) {
             for (InsFeeOrderNew item : willListnew) {
                 if (ObjectUtils.isNotEmpty(item)) {
@@ -330,7 +327,7 @@ public class SysUserAccountServiceImpl extends ServiceImpl<SysUserAccountMapper,
         sysUserAccountVo.setReceivedWillHalding(receivedWillHalding);
         //实收非跟单佣金
         sysUserAccountVo.setReceivedWillDocumentary(receivedWillDocumentary);
-        //提现现中
+        //提现现中 手续费、非跟单、推广费
         HashMap<String, Object> params = new HashMap<>();
         params.put("auditingStatus", "2");  // 待审核
         params.put("userId", userId);
@@ -339,6 +336,7 @@ public class SysUserAccountServiceImpl extends ServiceImpl<SysUserAccountMapper,
         params.clear();
         params.put("auditingStatus", "3");  // 已审核审核
         params.put("userId", userId);
+        //已提现 手续费、非跟单、推广费
         List<SysAmountAuditingEntity> sysAmountAuditingApproved = sysAmountAuditingService.getProgressIng(params);
         this.judgeSysAmountAuditing(sysAmountAuditingApproved, sysUserAccountVo);
         //预收手续费佣金
@@ -355,29 +353,24 @@ public class SysUserAccountServiceImpl extends ServiceImpl<SysUserAccountMapper,
         params.put("userId", BaseController.getUser().getId());
         //日期
         params.put("timeFiltering", sysUserAccountVo.getTimeFiltering());
-        // 预收和实收标志   1 预收 2.实收
-        params.put("type",sysUserAccountVo.getAuditingStatus());
+        //1预收2.实收
+        params.put("type",sysUserAccountVo.getSearchType());
         sysUserAccountVo.setInsFeeOrderNewList(null);
+        //金额类型 1. 手续费金额 2. 跟单金额  3. 推广金额
         if ("3".equals(sysUserAccountVo.getAmountType())) {
             List<InsFeeOrderNew> sumWillAmountGeneralization = insFeeOrderNewService.getSumWillAmountGeneralizationNew(params);
-            //List<InsFeeOrderNew> sumWillAmountGeneralization = insFeeOrderNewService.getSumWillAmountGeneralization(params);
             sysUserAccountVo.setInsFeeOrderNewList(sumWillAmountGeneralization);
         } else {
-
-            //List<InsFeeOrderNew> resultInsFeeOrderNew = insFeeOrderNewService.getSumWillAmount(params);
             List<InsFeeOrderNew> resultInsFeeOrderNew = insFeeOrderNewService.getSumWillAmountNew(params);
             if (resultInsFeeOrderNew!=null && resultInsFeeOrderNew.size()>0) {
                 for (InsFeeOrderNew item : resultInsFeeOrderNew) {
                     BigDecimal willPromotion = BigDecimal.ZERO;
                     if ("1".equals(sysUserAccountVo.getAmountType())) {
                         //手续费出口预收
-                        willPromotion =
-                                willPromotion.add(item.getJqExportSuperviseCostsPremiums()).add(item.getSyExportSuperviseCostsPremiums()).add(item.getNoExportSuperviseCostsPremiums());
+                        willPromotion = willPromotion.add(item.getJqExportSuperviseCostsPremiums()).add(item.getSyExportSuperviseCostsPremiums()).add(item.getNoExportSuperviseCostsPremiums());
                     } else if ("2".equals(sysUserAccountVo.getAmountType())) {
-                        willPromotion =
-                                willPromotion.add(item.getJqExportOtherCostsPremiums()).add(item.getSyExportOtherCostsPremiums()).add(item.getNoExportOtherCostsPremiums());
+                        willPromotion = willPromotion.add(item.getJqExportOtherCostsPremiums()).add(item.getSyExportOtherCostsPremiums()).add(item.getNoExportOtherCostsPremiums());
                     }
-
                     item.setWillAmount(willPromotion);
                     if (willPromotion.compareTo(BigDecimal.ZERO) != 0) {
                         resultList.add(item);
@@ -386,7 +379,6 @@ public class SysUserAccountServiceImpl extends ServiceImpl<SysUserAccountMapper,
                 sysUserAccountVo.setInsFeeOrderNewList(resultList);
             }
         }
-
         return sysUserAccountVo;
     }