来佣比对列表销售经纪人为空等问题

yd-api/src/main/java/com/yd/api/commission/service/impl/LifeCommissionServiceImpl.java

@@ -20,7 +20,6 @@ import org.apache.commons.lang.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
-import java.math.BigDecimal;
 import java.util.*;
 
 
@@ -46,13 +45,13 @@ public class LifeCommissionServiceImpl implements LifeCommissionService {
             resp.setDataList(pageInfo.getList());
             pageInfo.setList(null);
             // 不分页结果集统计总单数，总保费，总来佣，待来佣总数，已比对总数，已退保总数
-            Map<String, BigDecimal> summaries = lifeCommissionMapper.getSummaries(requestVO);
-            resp.setTotalOrderPrice(String.valueOf(summaries.get("totalOrderPrice")));
-            resp.setTotalCommission(String.valueOf(summaries.get("totalCommission")));
-            resp.setTotalSingular(String.valueOf(summaries.get("totalSingular")));
-            resp.setTotalDaiLaiYong(String.valueOf(summaries.get("totalDaiLaiYong")));
-            resp.setTotalYiBiDui(String.valueOf(summaries.get("totalYiBiDui")));
-            resp.setTotalYiTuiBao(String.valueOf(summaries.get("totalYiTuiBao")));
+            Map<String, Object> summaries = lifeCommissionMapper.getSummaries(requestVO);
+            resp.setTotalOrderPrice(summaries.get("totalOrderPrice").toString());
+            resp.setTotalCommission(summaries.get("totalCommission").toString());
+            resp.setTotalSingular(summaries.get("totalSingular").toString());
+            resp.setTotalDaiLaiYong(summaries.get("totalDaiLaiYong").toString());
+            resp.setTotalYiBiDui(summaries.get("totalYiBiDui").toString());
+            resp.setTotalYiTuiBao(summaries.get("totalYiTuiBao").toString());
 
             resp.setPage(pageInfo);
             resp.setCommonResult(new CommonResult(true, ZHBErrorConfig.getErrorInfo("800000")));
@@ -162,8 +161,6 @@ public class LifeCommissionServiceImpl implements LifeCommissionService {
             f.setCommissionPayoutBy(Long.valueOf(loginId));
         });
         customerFortuneDalService.updateBatch(fortuneList);
-        // 初始化withdraw和pay
-        agmsFortuneService.canPaymentUpDate("2", Long.valueOf("-1"), Long.valueOf(loginId), fortuneList);
     }
 
     private PageInfo<ComeCommissionVO> queryComeCommissionListPage(QueryComeCommissionListRequestVO requestVO) {

yd-api/src/main/java/com/yd/dal/mapper/lifecommission/LifeCommissionMapper.java

@@ -18,5 +18,5 @@ public interface LifeCommissionMapper {
 
     List<OrderCommissonCheck> findByCheckYearmonth(String orderCommissionCheckBatch);
 
-    Map<String, BigDecimal> getSummaries(QueryComeCommissionListRequestVO requestVO);
+    Map<String, Object> getSummaries(QueryComeCommissionListRequestVO requestVO);
 }

yd-api/src/main/java/com/yd/dal/mapper/order/PoOrderMapper.java

@@ -27,7 +27,7 @@ public interface PoOrderMapper {
 
     List<PolicyFactorInfoE> findPolicyFactorByOrderNosE(@Param("orderNoList") List<String> orderNoList);
 
-    PoOrder findByIdAndStatus(@Param("orderId")Long orderId, @Param("status")int status);
+    PoOrder findByIdAndStatus(@Param("id")Long orderId, @Param("status")int status);
 
     List<PoOrder> findByIds(List<Long> orderIds);
 }
\ No newline at end of file

yd-api/src/main/resources/mapper/customer/AclCustomerMapper.xml

@@ -788,10 +788,10 @@
     from  ag_acl_customer
     where 1=1
     <if test="mobileNo != null">
-      mobile_no = #{mobileNo,jdbcType=VARCHAR,typeHandler=com.yd.util.deshandler.DESTypeHandler},
+      and mobile_no = #{mobileNo,jdbcType=VARCHAR,typeHandler=com.yd.util.deshandler.DESTypeHandler}
     </if>
     <if test="email != null">
-      email = #{email,jdbcType=VARCHAR},
+      and email = #{email,jdbcType=VARCHAR}
     </if>
   </select>
 </mapper>
\ No newline at end of file

yd-api/src/main/resources/mapper/lifecommission/LifeCommissionMapper.xml

@@ -15,14 +15,16 @@
             o.commission_amount commissionAmount,
             o.commission_check_status commissionCheckStatus,
             o.order_date orderDate,
-            e.coverageTerm,
-            e.payTerm,
+            IFNULL(o.coverageTerm,e.coverageTerm) coverageTerm,
+            IFNULL(o.payTerm,e.payTerm) payTerm,
             f.name,
             f.practitioner_type_id practitionerTypeId,
             IFNULL(p.categoryName,a.categoryName2) categoryName,
             a.planCategoryName
         from (SELECT id, policy_no, order_price, commission_rate, commission_amount, commission_check_status, commission_check_id, product_id,
-                        plan_id, insurer_id, order_date, commission_check_at
+                        plan_id, insurer_id, order_date, commission_check_at,
+                        CONCAT(payment_term, (case payment_term_unit when 'Y' then '年' when 'M' then '月' else '日' END)) payTerm,
+                        CONCAT(cover_term, cover_term_type) coverageTerm
                 from ag_po_order t
                 where t.status in (3,4) and policy_no is not null
                 and (t.plan_id not in (424,453,464) or t.plan_id is null)
@@ -39,13 +41,11 @@
                         left join ag_product_category proc on proc.id = pro.product_category_id
                     ) a on o.plan_id = a.id
         left join ag_acl_insurer i on o.insurer_id = i.id
-        left join (SELECT order_id, name, practitioner_type_id
+        left join (SELECT order_id, name, practitioner_type_id, f.customer_id
                         from (
-                        select
-                        order_id,
-                        CASE WHEN referral_amount = MAX(referral_amount) THEN customer_id END customer_id
-                        from ag_acl_customer_fortune
-                        group by order_id
+                            select *
+                            from (select order_id, customer_id from ag_acl_customer_fortune order by referral_amount desc) f
+                            group by f.order_id
                             ) f
                         left join ag_acl_practitioner practitioner on f.customer_id = practitioner.customer_id
                         left join ag_acl_practitioner_setting setting on setting.practitioner_id = practitioner.id
@@ -115,13 +115,13 @@
     <select id="getSummaries" resultType="java.util.Map">
         select
             count(1) totalSingular,
-            sum(CASE WHEN o.commission_check_status = '1' THEN 1 ELSE 0 END) totalDaiLaiYong,
-            sum(CASE WHEN o.commission_check_status = '2' THEN 1 ELSE 0 END) totalYiBiDui,
-            sum(CASE WHEN o.commission_check_status = '3' THEN 1 ELSE 0 END) totalYiTuiBao,
-            sum(o.order_price) totalOrderPrice,
-            sum(o.commission_amount) totalCommission
-        from (SELECT id, policy_no, order_price, commission_rate, commission_amount, commission_check_status, commission_check_id, product_id,
-                plan_id, insurer_id, order_date, commission_check_at
+            IFNULL(sum(CASE WHEN o.commission_check_status = '1' THEN 1 ELSE 0 END),0) totalDaiLaiYong,
+            IFNULL(sum(CASE WHEN o.commission_check_status = '2' THEN 1 ELSE 0 END),0) totalYiBiDui,
+            IFNULL(sum(CASE WHEN o.commission_check_status = '3' THEN 1 ELSE 0 END),0) totalYiTuiBao,
+            IFNULL(sum(o.order_price),0) totalOrderPrice,
+            IFNULL(sum(o.commission_amount),0) totalCommission
+        from (SELECT order_price, commission_amount, commission_check_status, commission_check_id, order_date,
+                     insurer_id
                 from ag_po_order t
                 where t.status in (3,4) and policy_no is not null
                 and (t.plan_id not in (424,453,464) or t.plan_id is null)

yd-api/src/main/resources/mapper/order/PoOrderMapper.xml

@@ -1130,7 +1130,7 @@
         </foreach>
     </select>
 
-    <select id="findByIdAndStatus" parameterType="java.lang.Long" resultMap="BaseResultMap">
+    <select id="findByIdAndStatus" resultMap="BaseResultMap">
         select
         <include refid="Base_Column_List"/>
         from ag_po_order