删除玩物得志商家默认是藏家的逻辑，只根据藏家白名单判断是否是藏家

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

@@ -211,12 +211,16 @@ public class UserServiceImpl implements UserService {
         user.setMobile(phone);
         result.put("phone", phone);
         boolean collectorWhiteListFlag = collectorWhiteListDao.isExisted(dto.getUserId());
+        if (collectorWhiteListFlag) {
+            result.put("isCollector", true);
+        } else {
+            result.put("isCollector", false);
+        }
         int userLevel = UserEnum.LevelEnum.COMMON.getCode();
         //判断登录用户是否是分销商
         if (shopWhiteListDao.isExisted(dto.getUserId())) {
             ShopWhiteList shopWhiteList = shopWhiteListDao.findByUserId(dto.getUserId());
             result.put("isShop", true);
-            result.put("isCollector", true);
             result.put("shopId", shopWhiteList.getShopId() == null ? dto.getUserId() : shopWhiteList.getShopId());
             userLevel = UserEnum.LevelEnum.DISTRIBUTOR.getCode();
             if (collectorWhiteListFlag) {
@@ -229,7 +233,6 @@ public class UserServiceImpl implements UserService {
                     ShopDTO shopDTO = cloudServerResponse.getResult();
                     if (shopDTO != null && !ObjectUtils.isEmpty(shopDTO.getShopId()) && shopDTO.getPayStatus() == 1 && shopDTO.getCheckStatus() == 1 && shopDTO.getType() == 4) {
                         result.put("isShop", true);
-                        result.put("isCollector", true);
                         result.put("shopId", shopDTO.getShopId());
                         //新商家登录，在表中记录
                         ShopWhiteList shopWhiteList = new ShopWhiteList();

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

@@ -469,8 +469,8 @@ public class DistributionOrderServiceImpl implements DistributionOrderService {
             map.put("prepayId", prepayId);
             //计算分销商的利润
             DistributorProfit distributorProfit = new DistributorProfit();
-            //平台服务费
-            double channelServiceCost = distributionOrder.getAmount().doubleValue()  * 0.05;
+            //平台服务费，默认15%
+            double channelServiceCost = distributionOrder.getAmount().doubleValue()  * 0.15;
             //介绍人分佣,自己推荐获得的订单无需计算介绍佣金
         //    double introduceCost = 0;
         //    if (supplierItem.getCreatorId() != introducerId) {

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

@@ -9,6 +9,7 @@ import com.wwdz.ch.core.util.CacheUtil;
 import com.wwdz.ch.core.util.PriceUtil;
 import com.wwdz.ch.core.util.RedisUtils;
 import com.wwdz.ch.db.bean.DistributionOrderNum;
+import com.wwdz.ch.db.dao.CollectorWhiteListDao;
 import com.wwdz.ch.db.dao.FollowFansRecordDao;
 import com.wwdz.ch.db.dao.SwitchDao;
 import com.wwdz.ch.db.dao.UserDao;
@@ -89,6 +90,9 @@ public class SelfPageServiceImpl implements SelfPageService {
     @Autowired
     ShopWhiteListDao shopWhiteListDao;
 
+    @Autowired
+    CollectorWhiteListDao collectorWhiteListDao;
+
 
     @Override
     public Result getDistributorPageInfo(SelfPageRequestDto dto) {
@@ -255,9 +259,14 @@ public class SelfPageServiceImpl implements SelfPageService {
             map.put("count", count);
 
             //判断是否是藏家
+            boolean collectorWhiteListFlag = collectorWhiteListDao.isExisted(itemUserId);
+            if (collectorWhiteListFlag) {
+                map.put("isCollector", true);
+            } else {
+                map.put("isCollector", false);
+            }
             if (shopWhiteListDao.isExisted(itemUserId)) {
                 map.put("isShop", true);
-                map.put("isCollector", true);
             } else {
                 try {
                     CloudServerResponse<ShopDTO> cloudServerResponse = shopReadService.getShopByUserId(itemUserId, new ShopQueryOption());
@@ -265,13 +274,11 @@ public class SelfPageServiceImpl implements SelfPageService {
                         ShopDTO shopDTO = cloudServerResponse.getResult();
                         if (shopDTO != null && !ObjectUtils.isEmpty(shopDTO.getShopId()) && shopDTO.getPayStatus() == 1 && shopDTO.getCheckStatus() == 1 && shopDTO.getType() == 4) {
                             map.put("isShop", true);
-                            map.put("isCollector", true);
                         }
                     }
                 } catch (Exception e) {
                     logger.error("根据用户id查询店铺信息失败error:{}", e);
                     map.put("isShop", false);
-                    map.put("isCollector", false);
                 }
             }
             return Result.success(map);

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

@@ -11,6 +11,7 @@ import com.wwdz.ch.core.util.CacheUtil;
 import com.wwdz.ch.core.util.MediaUtil;
 import com.wwdz.ch.core.util.PriceUtil;
 import com.wwdz.ch.db.dao.CollectionBookSortDao;
+import com.wwdz.ch.db.dao.CollectorWhiteListDao;
 import com.wwdz.ch.db.dao.FollowFansRecordDao;
 import com.wwdz.ch.db.dao.SwitchDao;
 import com.wwdz.ch.db.dao.distribution.*;
@@ -134,6 +135,9 @@ public class SupplierItemServiceImpl implements SupplierItemService {
     @Autowired
     ShopWhiteListDao shopWhiteListDao;
 
+    @Autowired
+    CollectorWhiteListDao collectorWhiteListDao;
+
 
     @Override
     public Result findList(SupplierItemRequestDto dto) {
@@ -823,22 +827,11 @@ public class SupplierItemServiceImpl implements SupplierItemService {
                     supplierItemVo.setWechatQrCode(user.getWechatQrCode());
                 }
                 //判断是否是藏家
-                if (shopWhiteListDao.isExisted(supplierItem.getCreatorId())) {
+                boolean collectorWhiteListFlag = collectorWhiteListDao.isExisted(supplierItem.getCreatorId());
+                if (collectorWhiteListFlag) {
                     supplierItemVo.setIsCollector(true);
                 } else {
                     supplierItemVo.setIsCollector(false);
-                    try {
-                        CloudServerResponse<ShopDTO> cloudServerResponse = shopReadService.getShopByUserId(supplierItem.getCreatorId(), new ShopQueryOption());
-                        if (cloudServerResponse.isSuccess()) {
-                            ShopDTO shopDTO = cloudServerResponse.getResult();
-                            if (shopDTO != null && !ObjectUtils.isEmpty(shopDTO.getShopId()) && shopDTO.getPayStatus() == 1 && shopDTO.getCheckStatus() == 1 && shopDTO.getType() == 4) {
-                                supplierItemVo.setIsCollector(true);
-                            }
-                        }
-                    } catch (Exception e) {
-                        logger.error("根据用户id查询店铺信息失败error:{}", e);
-                        supplierItemVo.setIsCollector(false);
-                    }
                 }
             } else {
                 supplierItemVo.setIsMine(true);