1.修改账户的预收金额添加承保状态和未在审核表中的条件

2.添加按照时间查询订单的条件列表并添加车牌号

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

@@ -1,16 +1,12 @@
 package com.ydtech.modules.admin.controller;
 
 
-import com.ydtech.aop.request.RequestSingleParam;
 import com.ydtech.core.page.HttpResult;
 import com.ydtech.modules.admin.model.po.SysUserAccount;
-import com.ydtech.modules.admin.model.vo.SysUserAccountHistoryVo;
 import com.ydtech.modules.admin.model.vo.SysUserAccountVo;
 import com.ydtech.modules.admin.service.SysUserAccountService;
 import com.ydtech.modules.base.controller.BaseController;
-import com.ydtech.modules.esm.model.vo.EsmInsAttributionTemplateSaveVo;
 import com.ydtech.modules.order.entity.BasePageResult;
-import com.ydtech.modules.protocol.utils.AssertionUtils;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiModelProperty;
 import io.swagger.annotations.ApiOperation;
@@ -18,8 +14,6 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
 import javax.validation.Valid;
-import java.math.BigDecimal;
-import java.util.List;
 
 @Api(tags = "账户余额")
 @RequestMapping("/sysUserAccount")
@@ -52,7 +46,9 @@ public class SysUserAccountController extends BaseController {
     @GetMapping(value = "/getSysAllAmount")
     @ApiModelProperty("用户余额new")
     public HttpResult<SysUserAccountVo>  getSysAllAmount (){
-        String userId = BaseController.getUser().getId();
+
+        String   userId = BaseController.getUser().getId();
+
         SysUserAccountVo result = sysUserAccountService.getSysAllAmount(userId);
         return  HttpResult.ok("success", result);
     }

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

@@ -12,16 +12,17 @@ import com.ydtech.modules.admin.model.po.SysUserAccount;
 import com.ydtech.modules.admin.model.po.SysUserAccountHistory;
 import com.ydtech.modules.admin.model.po.SysUserBankCard;
 import com.ydtech.modules.admin.model.vo.SysUserAccountVo;
-import com.ydtech.modules.admin.model.vo.SysUserBankCardVO;
-import com.ydtech.modules.admin.service.*;
+import com.ydtech.modules.admin.service.SysAmountAuditingService;
+import com.ydtech.modules.admin.service.SysUserAccountHistoryService;
+import com.ydtech.modules.admin.service.SysUserAccountService;
+import com.ydtech.modules.admin.service.SysUserBankCardService;
 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.dao.InsOrdersMapper;
 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.entity.vo.OrderVo;
 import com.ydtech.modules.order.service.InsAreaCompanyService;
-import com.ydtech.modules.order.service.InsOrdersService;
 import com.ydtech.modules.protocols.entity.po.InsFeeOrderNew;
 import com.ydtech.modules.protocols.service.InsFeeOrderNewService;
 import org.apache.commons.lang3.ObjectUtils;
@@ -33,7 +34,6 @@ import org.springframework.transaction.annotation.Transactional;
 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;
@@ -61,6 +61,10 @@ public class SysUserAccountServiceImpl extends ServiceImpl<SysUserAccountMapper,
     @Autowired
     private InsFeeOrderNewService  insFeeOrderNewService;
 
+    @Autowired
+    private InsOrdersMapper  insOrdersMapper;
+
+
     @Override
     @Transactional
     public void addOrUpdate(SysUserAccount sysUserAccount) {
@@ -255,15 +259,18 @@ public class SysUserAccountServiceImpl extends ServiceImpl<SysUserAccountMapper,
         StringBuffer stringBuffer = new StringBuffer();
 
         willPromotion =   this.willPromotion(willPromotion,userId);  // 佣金
-        List<InsFeeOrderNew> willList = insFeeOrderNewService.getByUserId(userId);
+        // add by   hxl  修改sql 添加承保状态和不在审核表中的条件   begin ===============
+        //List<InsFeeOrderNew> willList = insFeeOrderNewService.getByUserId(userId);
+        List<InsFeeOrderNew> willList = insFeeOrderNewService.getByUserIdAndOrderStatusAndNoCheck(userId);
+        //  add by  hxl   end ==========================
         if(!CollectionUtils.isEmpty(willList)){
-           for (InsFeeOrderNew item : willList){
-               String quoteno = item.getInsOrderNo();
-               stringBuffer.append(quoteno).append(",");
-               if(ObjectUtils.isNotEmpty(item)){
-                  this.willAmount(item,willHalding,willDocumentary,sysUserAccountVo);  // 推广 非跟单
-               }
-           }
+            for (InsFeeOrderNew item : willList){
+                String quoteno = item.getInsOrderNo();
+                stringBuffer.append(quoteno).append(",");
+                if(ObjectUtils.isNotEmpty(item)){
+                    this.willAmount(item,willHalding,willDocumentary,sysUserAccountVo);  // 推广 非跟单
+                }
+            }
 
         }
 //        提现现中
@@ -292,11 +299,15 @@ public class SysUserAccountServiceImpl extends ServiceImpl<SysUserAccountMapper,
         BigDecimal willPromotion = BigDecimal.ZERO;
         if(StringUtils.isNotEmpty(sysUserAccountVo.getIds())){
             for (String insOrderNo : sysUserAccountVo.getIds().split(",")) {
-                InsAreaCompany byInsOrderNo = insAreaCompanyService.getByInsOrderNoNew(insOrderNo,sysUserAccountVo.getTimeFiltering());
+                 //add by hxl  begin   修改查询时间
+                //InsAreaCompany byInsOrderNo = insAreaCompanyService.getByInsOrderNoNew(insOrderNo,sysUserAccountVo.getTimeFiltering());
+                OrderVo byInsOrderNo = insAreaCompanyService.selectEntityByinsOrderNo(insOrderNo, sysUserAccountVo.getTimeFiltering());
                 if(ObjectUtils.isNotEmpty(byInsOrderNo)){
                     String id = byInsOrderNo.getId();
                     InsFeeOrderNew insFeeOrderNew = insFeeOrderNewService.getInsFeeOrderEntity(id);
                     insFeeOrderNew.setAmountType(sysUserAccountVo.getAmountType());
+                    //add  by hxl  添加车牌号
+                    insFeeOrderNew.setLicenseno(byInsOrderNo.getLicenseno());
                     //预收推广
                     willPromotion =this.getWillPromotion(insFeeOrderNew,willPromotion);
                     this.getWillAmount(insFeeOrderNew);  // 推广 非跟单
@@ -468,7 +479,7 @@ public class SysUserAccountServiceImpl extends ServiceImpl<SysUserAccountMapper,
                     if(willThreePremiums==null){
                         willThreePremiums=BigDecimal.ZERO;
                     }
-                 return   willPromotion.add(willFirstPremiums).add(willThreePremiums).add(willSecondPremiums);
+                    return   willPromotion.add(willFirstPremiums).add(willThreePremiums).add(willSecondPremiums);
                 }
             }
         }

src/main/java/com/ydtech/modules/order/dao/InsAreaCompanyMapper.java

@@ -62,6 +62,13 @@ public interface InsAreaCompanyMapper extends BaseMapper<InsAreaCompany> {
     InsOrders selectSecondPromotionBy(HashMap<String, Object> params);
 
     InsOrders selectThirdPromotionBy(HashMap<String, Object> params);
+    /**
+     *  @version
+     *  @author: hxl
+     *  @Date: 2024/5/8 17:48
+     *  @Description: 通过时间查询数据有效的数据
+     */
+    InsAreaCompany selectEntityByinsOrderNo(@Param("params") String ids, String timeFiltering);
 }
 
 

src/main/java/com/ydtech/modules/order/dao/InsOrdersMapper.java

@@ -78,4 +78,12 @@ public interface InsOrdersMapper extends BaseMapper<InsOrders> {
      *  @Description: 查询子订单的数据条数
      */
     Long queryPageSubOrdersCount(@Param("orderQueryVo") OrderTaskPoolsVo orderTaskPoolsVo);
+
+    /**
+     *  @version
+     *  @author: hxl
+     *  @Date: 2024/5/8 18:05
+     *  @Description: 通过年查询数据
+     */
+    OrderVo selectEntityByinsOrderNo(@Param("insOrderNo") String insOrderNo,@Param("timeFiltering")  String timeFiltering);
 }

src/main/java/com/ydtech/modules/order/service/InsAreaCompanyService.java

@@ -7,6 +7,7 @@ import com.ydtech.modules.order.entity.InsAreaCompanyAccidentalDriving;
 import com.ydtech.modules.order.entity.InsOrders;
 import com.ydtech.modules.order.entity.dto.InsAreaCompanyQueryDto;
 import com.ydtech.modules.order.entity.vo.OrderQueryVo;
+import com.ydtech.modules.order.entity.vo.OrderVo;
 import com.ydtech.modules.protocols.entity.po.InsFeeOrderNew;
 
 import java.util.List;
@@ -104,4 +105,11 @@ public interface InsAreaCompanyService extends IService<InsAreaCompany> {
     InsAreaCompany getByInsOrderNoNew(String insOrderNo, String timeFiltering);
 
     InsOrders selectByInFeeOrderNew(InsFeeOrderNew insFeeOrderNew, int i);
+    /**
+     *  @version
+     *  @author: hxl
+     *  @Date: 2024/5/8 18:08
+     *  @Description: 根据年份查询数据
+     */
+   OrderVo selectEntityByinsOrderNo(String insOrderNo, String timeFiltering);
 }

src/main/java/com/ydtech/modules/order/service/impl/InsAreaCompanyServiceImpl.java

@@ -5,18 +5,20 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.ydtech.exception.SystemException;
 import com.ydtech.modules.order.dao.InsAreaCompanyMapper;
+import com.ydtech.modules.order.dao.InsOrdersMapper;
 import com.ydtech.modules.order.entity.InsAreaCompany;
 import com.ydtech.modules.order.entity.InsAreaCompanyAccidentalDriving;
 import com.ydtech.modules.order.entity.InsOrders;
 import com.ydtech.modules.order.entity.dto.InsAreaCompanyQueryDto;
 import com.ydtech.modules.order.entity.vo.OrderQueryVo;
+import com.ydtech.modules.order.entity.vo.OrderVo;
 import com.ydtech.modules.order.service.InsAreaCompanyAccidentalDrivingService;
 import com.ydtech.modules.order.service.InsAreaCompanyService;
 import com.ydtech.modules.order.service.InsOrdersService;
 import com.ydtech.modules.order.service.InsOrdersTrackService;
 import com.ydtech.modules.protocols.entity.po.InsFeeOrderNew;
-import com.ydtech.utils.StringUtils;
 import com.ydtech.utils.idgen.IdGenerate;
+import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.annotation.Lazy;
 import org.springframework.stereotype.Service;
@@ -44,7 +46,8 @@ public class InsAreaCompanyServiceImpl extends ServiceImpl<InsAreaCompanyMapper,
     @Autowired
     private InsAreaCompanyAccidentalDrivingService insAreaCompanyAccidentalDrivingService;
 
-
+    @Autowired
+    private InsOrdersMapper insOrdersMapper;
     public InsAreaCompanyServiceImpl(@Lazy InsOrdersService insOrdersService, InsOrdersTrackService insOrdersTrackService) {
         this.insOrdersService = insOrdersService;
         this.insOrdersTrackService = insOrdersTrackService;
@@ -232,8 +235,16 @@ public class InsAreaCompanyServiceImpl extends ServiceImpl<InsAreaCompanyMapper,
         }
         return null;
     }
-
-
+    /**
+     *  @version
+     *  @author: hxl
+     *  @Date: 2024/5/8 18:06
+     *  @Description: 根据年分查询数据
+     */
+    @Override
+    public OrderVo selectEntityByinsOrderNo(String insOrderNo, String timeFiltering) {
+        return  insOrdersMapper.selectEntityByinsOrderNo(insOrderNo,timeFiltering);
+    }
 }
 
 

src/main/java/com/ydtech/modules/protocols/dao/InsFeeOrderNewMapper.java

@@ -2,7 +2,6 @@ package com.ydtech.modules.protocols.dao;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.ydtech.modules.protocols.entity.po.InsFeeOrderNew;
-import com.ydtech.modules.protocols.entity.po.PtlAgreementProductCostsAttrLink;
 import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
@@ -18,7 +17,13 @@ public interface InsFeeOrderNewMapper extends BaseMapper<InsFeeOrderNew> {
     InsFeeOrderNew getInsFeeOrderEntity(String id);
 
     List<InsFeeOrderNew> getByUserId(@Param("userId") String userId);
-
+    /**
+     *  @version
+     *  @author: hxl
+     *  @Date: 2024/5/8 15:56
+     *  @Description: 预收金额查询
+     */
+    List<InsFeeOrderNew> getByUserIdAndOrderStatusAndNoCheck(@Param("userId") String userId);
 }
 
 

src/main/java/com/ydtech/modules/protocols/entity/po/InsFeeOrderNew.java

@@ -3,14 +3,11 @@ package com.ydtech.modules.protocols.entity.po;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
-import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.NoArgsConstructor;
-import org.apache.poi.hpsf.Decimal;
 
-import javax.persistence.Table;
 import java.math.BigDecimal;
 import java.time.LocalDate;
 
@@ -383,6 +380,4 @@ public class InsFeeOrderNew {
     @ApiModelProperty(value = "预收跟单费")
     @TableField(exist = false)
     private String amountType;
-
-
 }

src/main/java/com/ydtech/modules/protocols/service/InsFeeOrderNewService.java

@@ -2,7 +2,6 @@ package com.ydtech.modules.protocols.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.ydtech.modules.protocols.entity.po.InsFeeOrderNew;
-import com.ydtech.modules.protocols.entity.po.PtlAgreementProductCostsAttrLink;
 
 import java.util.List;
 
@@ -21,4 +20,12 @@ public interface InsFeeOrderNewService extends IService<InsFeeOrderNew> {
 
     List<InsFeeOrderNew> getByUserId(String userId);
 
+    /**
+     *  @version
+     *  @author: hxl
+     *  @Date: 2024/5/8 15:49
+     *  @Description: 通过用户id查询预收金额的数据    查询  承保状态订单且不在 审核表中的数据
+     */
+    List<InsFeeOrderNew> getByUserIdAndOrderStatusAndNoCheck(String userId);
+
 }

src/main/java/com/ydtech/modules/protocols/service/impl/InsFeeOrderNewServiceImpl.java

@@ -2,13 +2,9 @@ package com.ydtech.modules.protocols.service.impl;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.ydtech.modules.order.entity.InsFeeOrder;
 import com.ydtech.modules.protocols.dao.InsFeeOrderNewMapper;
-import com.ydtech.modules.protocols.dao.PtlAgreementProductCostsAttrLinkMapper;
 import com.ydtech.modules.protocols.entity.po.InsFeeOrderNew;
-import com.ydtech.modules.protocols.entity.po.PtlAgreementProductCostsAttrLink;
 import com.ydtech.modules.protocols.service.InsFeeOrderNewService;
-import com.ydtech.modules.protocols.service.PtlAgreementProductCostsAttrLinkService;
 import org.springframework.stereotype.Service;
 
 import java.util.List;
@@ -43,4 +39,14 @@ public class InsFeeOrderNewServiceImpl extends ServiceImpl<InsFeeOrderNewMapper,
     public List<InsFeeOrderNew> getByUserId(String userId) {
         return baseMapper.getByUserId(userId);
     }
+    /**
+     *  @version
+     *  @author: hxl
+     *  @Date: 2024/5/8 15:55
+     *  @Description:  预收金额列表查询
+     */
+    @Override
+    public List<InsFeeOrderNew> getByUserIdAndOrderStatusAndNoCheck(String userId) {
+        return baseMapper.getByUserIdAndOrderStatusAndNoCheck(userId);
+    }
 }

src/main/resources/mapper/modules/ins/InsFeeOrderNewMapper.xml

@@ -196,5 +196,12 @@
 
     </select>
 
-
+    <select id="getByUserIdAndOrderStatusAndNoCheck"  resultType="com.ydtech.modules.protocols.entity.po.InsFeeOrderNew">
+        select a.*  from
+            ins_fee_order_new a  left join ins_area_company ins  on  a.ins_order_no=ins.id
+        WHERE
+            a.user_id = #{userId}
+          and  ins.orderstatus ='3'
+          and a.ins_order_no  not in (select ins_order_no from ins_fee_audit)
+    </select>
 </mapper>

src/main/resources/mapper/modules/order/InsAreaCompanyMapper.xml

@@ -396,4 +396,35 @@
             AND createtime BETWEEN #{params.startDateStr} and #{params.endDateStr}
         </if>
     </select>
+
+
+    <select id="selectEntityByinsOrderNo" resultType="com.ydtech.modules.order.entity.InsAreaCompany">
+        SELECT
+        sum(a.first_detail_premiums) as "willFirstPremiums"
+        FROM
+        ins_fee_order_new a
+        LEFT JOIN ins_area_company iac on iac.id=a.ins_order_no
+        WHERE
+        a.id NOT IN (
+        SELECT
+        ins_order_no
+        FROM
+        ins_fee_audit
+        )
+        AND iac.orderstatus =3
+        <if test="firstUserId != null and firstUserId != ''">
+            AND a.first_level_user_id = #{firstUserId}
+        </if>
+        <if test="secondUserId != null and secondUserId != ''">
+            AND a.two_level_user_id = #{secondUserId}
+        </if>
+
+        <if test="thirdUserId != null and thirdUserId != ''">
+            AND a.three_level_user_id = #{thirdUserId}
+        </if>
+
+        <if test="id != null and id != ''">
+            AND a.id = #{id}
+        </if>
+    </select>
 </mapper>

src/main/resources/mapper/modules/order/InsOrdersMapper.xml

@@ -1170,4 +1170,55 @@
         group by iac.id
         ) as s
     </select>
+
+
+    <select id="selectEntityByinsOrderNo"  resultMap="OrderResultMap">
+        select o.orderno,
+               o.quoteno,
+               o.frameno,
+               o.licenseno,
+               iac.jq_start_date as jqstartdate,
+               iac.jq_end_date   as jqenddate,
+               iac.sy_start_date as systartdate,
+               iac.sy_end_date   as syenddate,
+               iac.id,
+               iac.company_id,
+               iac.reptxt,
+               iac.orderstatus,
+               iac.inscompany,
+               iac.jqapplyno,
+               iac.jqpolicyno,
+               iac.syapplyno,
+               iac.sypolicyno,
+               iac.riskinfo,
+               iac.kindinfo,
+               iac.jqpremium,
+               iac.sypremium,
+               iac.jypremium,
+               iac.taxamount,
+               iac.sumpremium,
+               iac.jqdiscountrate,
+               iac.sydiscountrate,
+               iac.feerate,
+               iac.disrate,
+               iac.auditid,
+               iac.auditname,
+               iac.audittime,
+               iac.auditopinion,
+               iac.jqappoint,
+               iac.syappoint,
+               iac.createtime,
+               iac.payment_link,
+               iac.accident_info,
+               iac.tax_arrears,
+               iac.cross_insurance,
+               iac.ubi_predicted_info_score
+        from ins_area_company iac
+                 join ins_orders as o on o.orderno = iac.orderno
+        where
+             iac.id = #{insOrderNo}
+            <if test="timeFiltering != null and timeFiltering != ''">
+                and  DATE_FORMAT(iac.signing_time, '%Y-%m') = #{timeFiltering}
+            </if>
+    </select>
 </mapper>