藏家个人主页

ch-dao/src/main/java/com/wwdz/ch/db/dao/distribution/DistributionOrderDao.java

@@ -142,6 +142,14 @@ public interface DistributionOrderDao {
      */
     List<DistributionOrderNum> countGroupByStateForDistributor(long distributorId);
 
+    /**
+     * 统计藏家各状态的订单数量
+     * @param userId
+     * @return
+     */
+    List<DistributionOrderNum> countGroupByStateForCollector(long userId);
+
+
     /**
      * 统计用户各状态的订单数量
      * @param userId

ch-dao/src/main/java/com/wwdz/ch/db/impl/distribution/DistributionOrderDaoImpl.java

@@ -193,6 +193,11 @@ public class DistributionOrderDaoImpl implements DistributionOrderDao {
         return distributionOrderMapper.countGroupByStateForDistributor(distributorId);
     }
 
+    @Override
+    public List<DistributionOrderNum> countGroupByStateForCollector(long userId) {
+        return distributionOrderMapper.countGroupByStateForCollector(userId);
+    }
+
     @Override
     public List<DistributionOrderNum> countGroupByStateForUser(long userId) {
         return distributionOrderMapper.countGroupByStateForUser(userId);

ch-dao/src/main/java/com/wwdz/ch/db/mapper/distribution/DistributionOrderMapper.java

@@ -75,7 +75,12 @@ public interface DistributionOrderMapper {
      */
     List<DistributionOrderNum> countGroupByStateForDistributor(@Param("sellerId")Long distributorId);
 
-
+    /**
+     * 统计分销商各状态的订单数量
+     * @param distributorId
+     * @return
+     */
+    List<DistributionOrderNum> countGroupByStateForCollector(@Param("sellerId")Long userId);
 
     /**
      * 介绍人产生的订单金额总和

ch-dao/src/main/resources/com/wwdz/ch/db/mapper/distribution/DistributionOrderMapper.xml

@@ -634,6 +634,10 @@
     select state, count(distribution_order_id) as num from distribution_order where seller_id = #{sellerId} group by state
   </select>
 
+  <select id="countGroupByStateForCollector" parameterType="java.lang.Long" resultType="com.wwdz.ch.db.bean.DistributionOrderNum">
+    select state, count(distribution_order_id) as num from distribution_order where seller_id = #{sellerId} and type =3 group by state
+  </select>
+
   <select id="countGroupByStateForUser" parameterType="java.lang.Long" resultType="com.wwdz.ch.db.bean.DistributionOrderNum">
     select state, count(distribution_order_id) as num from distribution_order where buyer_id = #{buyerId} group by state
   </select>

ch-wx-api/src/main/java/com/wwdz/ch/wx/impl/UserServiceImpl.java

@@ -214,6 +214,13 @@ public class UserServiceImpl implements UserService {
                     if (shopDTO != null && !ObjectUtils.isEmpty(shopDTO.getShopId()) && shopDTO.getPayStatus() == 1 && shopDTO.getCheckStatus() == 1 && shopDTO.getType() == 4) {
                         result.put("isShop", true);
                         result.put("shopId", shopDTO.getShopId());
+                        //新商家登录，在表中记录
+                        ShopWhiteList shopWhiteList = new ShopWhiteList();
+                        shopWhiteList.setUserId(dto.getUserId());
+                        shopWhiteList.setShopId(dto.getUserId());
+                        shopWhiteList.setCreateTime(new Date());
+                        shopWhiteList.setIsValid(true);
+                        shopWhiteListDao.insert(shopWhiteList);
                     } else {
                         result.put("isShop", false);
                     }

ch-wx-api/src/main/java/com/wwdz/ch/wx/impl/distribution/SelfPageServiceImpl.java

@@ -155,7 +155,7 @@ public class SelfPageServiceImpl implements SelfPageService {
             selfPageInfoVo.setAvatarUrl(cacheUtil.appletUserInfoCache.get(dto.getUserId()).get().getAvatar());
             selfPageInfoVo.setProfile(cacheUtil.appletUserInfoCache.get(dto.getUserId()).get().getProfile());
             selfPageInfoVo.setBackground(cacheUtil.appletUserInfoCache.get(dto.getUserId()).get().getBackground());
-            List<DistributionOrderNum> distributionOrderNumList = distributionOrderDao.countGroupByStateForDistributor(dto.getUserId());
+            List<DistributionOrderNum> distributionOrderNumList = distributionOrderDao.countGroupByStateForCollector(dto.getUserId());
             distributionOrderNumList.forEach(distributionOrderNum -> {
                 distributionOrderNum.setStateName(DistributionEnum.DistributionOrderStateEnum.getNameByCode(distributionOrderNum.getState()));
             });