机构画像

src/main/java/com/caimei/modules/order/service/CmPayShopService.java

@@ -379,8 +379,6 @@ public class CmPayShopService extends CrudService<CmPayShopDao, CmPayShop> {
                     } else {
                         so.setBrokerage(null);
                     }*/
-                } else {
-                    so.setBrokerage(null);
                 }
                 //要是不大于成本默认显示
 

src/main/resources/mappings/modules/user/CmPortraitMapper.xml

@@ -47,8 +47,8 @@
 
     <select id="selOrderList" resultType="com.caimei.modules.order.entity.NewOrder">
         SELECT
-        (SELECT COUNT(shopOrderId) FROM cm_shop_order WHERE clubID = 7814 AND shopStatus != 4 AND shopStatus != 5 AND refundStatus != 2 AND orderTime <![CDATA[ < ]]> NOW()) AS orderTotal,
-        (SELECT IFNULL(SUM(totalAmount), 0) FROM cm_shop_order WHERE clubID = 7814 AND shopStatus != 4 AND shopStatus != 5 AND refundStatus != 2 AND orderTime <![CDATA[ < ]]> NOW()) AS orderTotalAmount,
+        (SELECT COUNT(shopOrderId) FROM cm_shop_order WHERE clubID = #{clubID} AND shopStatus != 4 AND shopStatus != 5 AND refundStatus != 2 AND orderTime <![CDATA[ < ]]> NOW()) AS orderTotal,
+        (SELECT IFNULL(SUM(totalAmount), 0) FROM cm_shop_order WHERE clubID = #{clubID} AND shopStatus != 4 AND shopStatus != 5 AND refundStatus != 2 AND orderTime <![CDATA[ < ]]> NOW()) AS orderTotalAmount,
         cso.clubID,
         co.secondHandOrderFlag,
         co.rebateFlag,
@@ -58,8 +58,9 @@
         cso.orderTime
         FROM cm_shop_order cso
         LEFT JOIN cm_order co ON cso.orderId = co.orderId
+        LEFT JOIN cm_order_product cop ON cso.shopOrderId = cop.shopOrderId
         <where>
-            cso.clubID = #{clubID} AND cso.shopStatus != 4 AND cso.shopStatus != 5 AND cso.refundStatus != 2
+            cso.clubID = #{clubID} AND cso.shopStatus != 4 AND cso.shopStatus != 5 AND cso.refundStatus != 2 AND cop.productId != 999
              <if test="startTime != null and startTime != '' and endTime != null and endTime != ''">
                  AND cso.orderTime <![CDATA[ >= ]]> #{startTime} AND cso.orderTime <![CDATA[ <= ]]> #{endTime}
              </if>