推广费用清单修改

src/main/java/com/ydtech/modules/fnc/service/impl/InsFeeAuditServiceImpl.java

@@ -177,20 +177,23 @@ public class InsFeeAuditServiceImpl extends ServiceImpl<InsFeeAuditMapper, InsFe
                 sysUserAccount.setSuborderId(orderNo);  // 订单Id
                 sysUserAccountService.addOrUpdate(sysUserAccount);
 
-                if (insFeeOrderNew.getFirstLevelUserId() != null) {
-                    createInsFeeOrderNewDistribution(insFeeOrderNew, insAreaCompany, order,
-                            insFeeOrderNew.getFirstLevelUserId(), insFeeOrderNew.getFirstDetailProportion(),
-                            insFeeOrderNew.getFirstDetailPremiums(), insFeeOrderNew.getDistributionStatus());
-                }
-                if (insFeeOrderNew.getTwoLevelUserId() != null) {
-                    createInsFeeOrderNewDistribution(insFeeOrderNew, insAreaCompany, order,
-                            insFeeOrderNew.getTwoLevelUserId(), insFeeOrderNew.getSecondDetailProportion(),
-                            insFeeOrderNew.getSecondDetailPremiums(), insFeeOrderNew.getDistributionStatus());
-                }
-                if (insFeeOrderNew.getThreeLevelUserId() != null) {
-                    createInsFeeOrderNewDistribution(insFeeOrderNew, insAreaCompany, order,
-                            insFeeOrderNew.getThreeLevelUserId(), insFeeOrderNew.getThirdDetailProportion(),
-                            insFeeOrderNew.getThirdDetailPremiums(), insFeeOrderNew.getDistributionStatus());
+                if (insFeeOrderNew.getDistributionStatus() !=null) {
+                    if (insFeeOrderNew.getFirstLevelUserId() != null) {
+                        createInsFeeOrderNewDistribution(insFeeOrderNew, insAreaCompany, order,
+                                insFeeOrderNew.getFirstLevelUserId(), insFeeOrderNew.getFirstDetailProportion(),
+                                insFeeOrderNew.getFirstDetailPremiums(), "1");
+                    }
+                    if (insFeeOrderNew.getTwoLevelUserId() != null) {
+                        createInsFeeOrderNewDistribution(insFeeOrderNew, insAreaCompany, order,
+                                insFeeOrderNew.getTwoLevelUserId(), insFeeOrderNew.getSecondDetailProportion(),
+                                insFeeOrderNew.getSecondDetailPremiums(), "2");
+                    }
+                    if (insFeeOrderNew.getThreeLevelUserId() != null) {
+                        createInsFeeOrderNewDistribution(insFeeOrderNew, insAreaCompany, order,
+                                insFeeOrderNew.getThreeLevelUserId(), insFeeOrderNew.getThirdDetailProportion(),
+                                insFeeOrderNew.getThirdDetailPremiums(), "3");
+                    }
+                    createInsFeeOrderNewDistribution(insFeeOrderNew, insAreaCompany, order, order.getUserid(),BigDecimal.ZERO, BigDecimal.ZERO, "0");
                 }
 
 
@@ -266,6 +269,7 @@ public class InsFeeAuditServiceImpl extends ServiceImpl<InsFeeAuditMapper, InsFe
         insFeeOrderNewDistribution.setOrderNo(insFeeOrderNew.getInsOrderNo());
         insFeeOrderNewDistribution.setJqPolicyNo(insAreaCompany.getJqpolicyno());
         insFeeOrderNewDistribution.setSyPolicyNo(insAreaCompany.getSypolicyno());
+        insFeeOrderNewDistribution.setOperator(insOrders.getUserid());
         insFeeOrderNewDistribution.setLicenseNo(insOrders.getLicenseno());
         insFeeOrderNewDistribution.setProductId(insAreaCompany.getProductid());
         insFeeOrderNewDistribution.setProduct(insAreaCompany.getProduct());
@@ -275,6 +279,7 @@ public class InsFeeAuditServiceImpl extends ServiceImpl<InsFeeAuditMapper, InsFe
         insFeeOrderNewDistribution.setCommissionRate(commissionRate);
         insFeeOrderNewDistribution.setCommissionAmount(commissionAmount);
         insFeeOrderNewDistribution.setCommissionLevel(commissionLevel);
+        insFeeOrderNewDistribution.setCreateTime(new Date());
         // 保存insFeeOrderNewDistribution
         insFeeOrderNewDistributionService.save(insFeeOrderNewDistribution);
     }

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

@@ -35,6 +35,10 @@ public class InsFeeOrderNewDistribution {
     @TableField(value = "sy_policy_no")
     private String syPolicyNo;
 
+    @ApiModelProperty(value = "业务员")
+    @TableField(value = "operator")
+    private String operator;
+
     @ApiModelProperty(value = "车牌号")
     @TableField(value = "license_no")
     private String licenseNo;

src/main/java/com/ydtech/modules/protocols/entity/vo/InsFeeOrderNewDistributionVo.java

@@ -27,6 +27,10 @@ public class InsFeeOrderNewDistributionVo {
     @TableField(value = "sy_policy_no")
     private String syPolicyNo;
 
+    @ApiModelProperty(value = "业务员")
+    @TableField(value = "operator")
+    private String operator;
+
     @ApiModelProperty(value = "车牌号")
     @TableField(value = "license_no")
     private String licenseNo;
@@ -72,6 +76,9 @@ public class InsFeeOrderNewDistributionVo {
     @TableField(exist = false)
     private String deptName;
 
+    @TableField(exist = false)
+    private String operatorName;
+
     private String signTimeStart;
 
     private String signTimeEnd;

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

@@ -192,11 +192,8 @@
             and DATE_FORMAT(iac.createtime, '%Y-%m-%d') between #{params.quoteStartDateStr} AND
             #{params.quoteEndDateStr}
         </if>
-        <if test="params.taskNo != null and params.taskNo != ''">
-            AND io.orderno = #{params.taskNo}
-        </if>
         <if test="params.orderNo != null and params.orderNo != ''">
-            AND iac.id = #{params.orderNo}
+            AND io.orderno= #{params.orderNo}
         </if>
         <if test="params.licenseNo != null and params.licenseNo != ''">
             AND io.licenseno = #{params.licenseNo}

src/main/resources/mapper/modules/protocols/InsFeeOrderNewDistributionMapper.xml

@@ -6,6 +6,7 @@
         <result column="order_no" jdbcType="VARCHAR" property="orderNo"/>
         <result column="jq_policy_no" jdbcType="VARCHAR" property="jqPolicyNo"/>
         <result column="sy_policy_no" jdbcType="VARCHAR" property="syPolicyNo"/>
+        <result column="operatorName" jdbcType="VARCHAR" property="operatorName"/>
         <result column="license_no" jdbcType="VARCHAR" property="licenseNo"/>
         <result column="product_id" jdbcType="VARCHAR" property="productId"/>
         <result column="product" jdbcType="VARCHAR" property="product"/>
@@ -22,26 +23,33 @@
     </resultMap>
 
     <select id="getList" resultMap="BaseResultMap">
-        select
-            a.id,
-            a.order_no,
-            a.jq_policy_no,
-            a.sy_policy_no,
-            a.license_no,
-            a.product_id,
-            a.product,
-            a.sign_time,
-            a.ins_company,
-            a.user_id,
-            a.commission_rate,
-            a.commission_amount,
-            a.commission_level,
-            b.name as userName,
-            c.name as deptName,
-            c.id as deptId
-            FROM ins_fee_order_new_distribution a
-            left join sys_user b on a.user_id = b.id
-            left join sys_dept c on b.dept_id = c.id
+        SELECT
+        a.id,
+        a.order_no,
+        a.jq_policy_no,
+        a.sy_policy_no,
+        a.operator,
+        a.license_no,
+        a.product_id,
+        a.product,
+        a.sign_time,
+        a.ins_company,
+        a.user_id,
+        a.commission_rate,
+        a.commission_amount,
+        a.commission_level,
+        b.name AS userName,
+        c.name AS deptName,
+        c.id AS deptId,
+        d.name AS operatorName
+        FROM
+        ins_fee_order_new_distribution a
+        LEFT JOIN
+        sys_user b ON a.user_id = b.id
+        LEFT JOIN
+        sys_dept c ON b.dept_id = c.id
+        LEFT JOIN
+        sys_user d ON a.operator = d.id
             where 1=1
             <if test="insFeeOrderNewDistributionVo.orderNo != null and insFeeOrderNewDistributionVo.deptId != ''">
                     and a.order_no = #{insFeeOrderNewDistributionVo.orderNo}
@@ -55,6 +63,9 @@
             <if test="insFeeOrderNewDistributionVo.userName != null and insFeeOrderNewDistributionVo.userName != ''">
                     and b.name = #{insFeeOrderNewDistributionVo.userName}
             </if>
+            <if test="insFeeOrderNewDistributionVo.operator != null and insFeeOrderNewDistributionVo.operator != ''">
+                    and d.name = #{insFeeOrderNewDistributionVo.operator}
+            </if>
             <if test="insFeeOrderNewDistributionVo.licenseNo != null and insFeeOrderNewDistributionVo.licenseNo != ''">
                     and a.license_no = #{insFeeOrderNewDistributionVo.licenseNo}
             </if>