1 预收订单号

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

@@ -19,6 +19,7 @@ import org.springframework.web.bind.annotation.*;
 
 import javax.validation.Valid;
 import java.math.BigDecimal;
+import java.util.List;
 
 @Api(tags = "账户余额")
 @RequestMapping("/sysUserAccount")
@@ -55,6 +56,12 @@ public class SysUserAccountController extends BaseController {
         SysUserAccountVo result = sysUserAccountService.getSysAllAmount(userId);
         return  HttpResult.ok("success", result);
     }
+    @GetMapping("getInsOrders")
+    @ApiOperation("获取子订单号")
+    public HttpResult<SysUserAccountVo>  getInsOrders(@PathVariable("ids") String  ids){
+        SysUserAccountVo result =sysUserAccountService.getInsOrders(ids);
+        return  HttpResult.ok("success", result);
+    }
 
 
 

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

@@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.annotation.FieldFill;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.fasterxml.jackson.annotation.JsonFormat;
+import com.ydtech.modules.protocols.entity.po.InsFeeOrderNew;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
@@ -13,6 +14,7 @@ import javax.validation.constraints.Max;
 import javax.validation.constraints.Min;
 import java.math.BigDecimal;
 import java.util.Date;
+import java.util.List;
 
 @Data
 @ApiModel("查询Vo")
@@ -123,4 +125,9 @@ public class SysUserAccountVo {
     private BigDecimal approvedDocumentary;
     @ApiModelProperty(value = "提现中推广费")
     private BigDecimal approvedPromotion;
+    @ApiModelProperty(value = "报价id")
+    private String setIds;
+    @ApiModelProperty("子订单数组")
+    private List<InsFeeOrderNew> insFeeOrderNewList;
+
 }

src/main/java/com/ydtech/modules/admin/service/SysUserAccountService.java

@@ -6,6 +6,8 @@ import com.ydtech.modules.admin.model.po.SysUserAccount;
 import com.ydtech.modules.admin.model.vo.SysUserAccountVo;
 import com.ydtech.modules.order.entity.BasePageResult;
 
+import java.util.List;
+
 /**
 * @author Administrator
 * @description 针对表【sys_user_account(用户账户表)】的数据库操作Service
@@ -23,4 +25,6 @@ public interface SysUserAccountService extends IService<SysUserAccount> {
     SysUserAccount getSysUserAmount(String userid);
 
     SysUserAccountVo getSysAllAmount(String userId);
+
+    SysUserAccountVo getInsOrders(String ids);
 }

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

@@ -18,6 +18,7 @@ import com.ydtech.modules.base.controller.BaseController;
 import com.ydtech.modules.esm.model.EsmUserReferrer;
 import com.ydtech.modules.esm.service.EsmUserReferrerService;
 import com.ydtech.modules.order.entity.BasePageResult;
+import com.ydtech.modules.order.entity.InsAreaCompany;
 import com.ydtech.modules.order.entity.InsOrders;
 import com.ydtech.modules.order.service.InsAreaCompanyService;
 import com.ydtech.modules.order.service.InsOrdersService;
@@ -33,6 +34,7 @@ import org.springframework.util.CollectionUtils;
 
 import java.math.BigDecimal;
 import java.math.RoundingMode;
+import java.util.ArrayList;
 import java.util.Date;
 import java.util.HashMap;
 import java.util.List;
@@ -250,13 +252,16 @@ public class SysUserAccountServiceImpl extends ServiceImpl<SysUserAccountMapper,
         BigDecimal  willHalding=BigDecimal.ZERO;        //预收手续费佣金
         BigDecimal  willDocumentary =BigDecimal.ZERO;   //预收 非跟单佣金
         BigDecimal  willPromotion =BigDecimal.ZERO;   //预收 推广
+        StringBuffer stringBuffer = new StringBuffer();
 
         this.willPromotion(willPromotion,userId);  // 佣金
         List<InsOrders> willList = insAreaCompanyService.getByUserId(userId);
         if(!CollectionUtils.isEmpty(willList)){
            for (InsOrders item : willList){
                String quoteno = item.getQuoteno();
+               stringBuffer.append(quoteno).append(",");
                if(StringUtils.isNotEmpty(quoteno)){
+
                   this.willAmount(quoteno,willHalding,willDocumentary);  // 推广 非跟单
                }
            }
@@ -276,6 +281,27 @@ public class SysUserAccountServiceImpl extends ServiceImpl<SysUserAccountMapper,
         sysUserAccountVo.setWillHalding(willHalding);
         sysUserAccountVo.setWillDocumentary(willDocumentary);
         sysUserAccountVo.setWillPromotion(willPromotion);
+        String ids = stringBuffer.toString();
+        if (ids.endsWith(",")) {
+            ids = ids.substring(0, ids.length() - 1);  // 去掉末尾的逗号
+        }
+        sysUserAccountVo.setSetIds(ids);
+        return sysUserAccountVo;
+    }
+
+    @Override
+    public SysUserAccountVo getInsOrders(String ids) {
+        SysUserAccountVo sysUserAccountVo = new SysUserAccountVo();
+        ArrayList<InsFeeOrderNew> resultList = new ArrayList<>();
+        if(StringUtils.isNotEmpty(ids)){
+            for (String insOrderNo : ids.split(",")) {
+                InsAreaCompany byInsOrderNo = insAreaCompanyService.getByInsOrderNo(insOrderNo);
+                String id = byInsOrderNo.getId();
+                InsFeeOrderNew insFeeOrderNew = insFeeOrderNewService.getInsFeeOrderNewByCompanyId(id);
+                resultList.add(insFeeOrderNew);
+            }
+        }
+        sysUserAccountVo.setInsFeeOrderNewList(resultList);
         return sysUserAccountVo;
     }
 
@@ -312,7 +338,7 @@ public class SysUserAccountServiceImpl extends ServiceImpl<SysUserAccountMapper,
                 }
                 if("3".equals(item.getAmountStatus())){  //推广费
                     BigDecimal amount = item.getAmount();
-                    sysUserAccountVo.setWithdrawalDocumentary(amount);
+                    sysUserAccountVo.setWithdrawalPromotion(amount);
                 }
 
             }