龙虎榜与经纪人首页销售统计数据,以前是通过N22接口获取,现在通过本地获取2

yd-api/src/main/java/com/yd/dal/entity/order/CustomerPolicyInfo.java

@@ -24,6 +24,7 @@ public class CustomerPolicyInfo implements Comparable<CustomerPolicyInfo>{
     private Long productId;
     private Long fortuneId;
     private String isValid;// 保单状态，有效，无效
+    private String settlementRuleType;// 结算规则类型(1:简单基本法;2:标准基本法)
 
     public Long getOrderId() {
         return orderId;
@@ -162,4 +163,19 @@ public class CustomerPolicyInfo implements Comparable<CustomerPolicyInfo>{
     public void setIsValid(String isValid) {
         this.isValid = isValid;
     }
+    
+	/**
+	 * @return the settlementRuleType
+	 */
+	public String getSettlementRuleType() {
+		return settlementRuleType;
+	}
+	
+	/**
+	 * @param settlementRuleType the settlementRuleType to set
+	 */
+	public void setSettlementRuleType(String settlementRuleType) {
+		this.settlementRuleType = settlementRuleType;
+	}
+    
 }

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

@@ -1025,13 +1025,14 @@
         o.product_id as productId ,
         f.id as fortuneId,
         pr.name as productName,
-        pl.name as planName
+        pl.name as planName,
+        o.settlement_rule_type settlementRuleType
         FROM ag_acl_customer_fortune f 
         INNER JOIN ag_po_order o ON f.order_id = o.id and o.status = 3 AND o.payment_status=3 and o.order_price > 0 and o.insurer_id != 888
         INNER JOIN ag_acl_policyholder p ON o.id = p.order_id and p.type = 2
         LEFT  JOIN ag_product pr ON pr.id = o.product_id
         LEFT  JOIN ag_product_plan pl ON pl.id = o.plan_id
-        WHERE f.drop_option_code = 'S01' AND f.customer_id = #{customerId,jdbcType=BIGINT}
+        WHERE f.drop_option_code in('S01','C01') AND f.customer_id = #{customerId,jdbcType=BIGINT} AND o.product_category_id not in('2','5','8')
         <choose>
             <when test="time == 1">
                 and DATE_FORMAT(o.order_date, '%Y%m' ) = DATE_FORMAT( CURDATE( ) , '%Y%m' )
@@ -1063,13 +1064,14 @@
         o.product_id as productId ,
         f.id as fortuneId,
         pr.name as productName,
-        pl.name as planName
+        pl.name as planName,
+        o.settlement_rule_type settlementRuleType
         FROM ag_acl_customer_fortune f
         INNER JOIN ag_po_order o ON f.order_id = o.id AND o.status = 3 AND o.payment_status=3 AND o.order_price &gt; 0 AND o.insurer_id != 888
         INNER JOIN ag_acl_policyholder p ON o.id = p.order_id AND p.type = 2
         LEFT  JOIN ag_product pr ON pr.id = o.product_id
         LEFT  JOIN ag_product_plan pl ON pl.id = o.plan_id
-        WHERE f.drop_option_code IN('S01','C01') AND o.product_category_id ='8' AND f.customer_id = #{customerId,jdbcType=BIGINT}
+        WHERE f.drop_option_code IN('S01','C01') AND f.customer_id = #{customerId,jdbcType=BIGINT} AND o.product_category_id in('2','5','8')
         <choose>
             <when test="time == 1">
                 and DATE_FORMAT(o.order_date, '%Y%m' ) = DATE_FORMAT( CURDATE( ) , '%Y%m' )