商品详情页插图新增

ch-core/src/main/java/com/wwdz/ch/core/entity/SupplierItemVo.java

@@ -309,4 +309,9 @@ public class SupplierItemVo implements Entity {
      */
     private Integer lot;
 
+    /**
+     * 页面插图
+     */
+    private String appendImageUrl;
+
 }

ch-wx-api/src/main/java/com/wwdz/ch/wx/entity/vo/distribution/AuctionDetailVo.java

@@ -138,4 +138,9 @@ public class AuctionDetailVo implements Entity {
      */
     private Integer specialPerformanceId;
 
+    /**
+     * 页面插图
+     */
+    private String appendImageUrl;
+
 }

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

@@ -306,8 +306,9 @@ public class DistributionOrderServiceImpl implements DistributionOrderService {
                 distributorProfitDao.insert(distributorProfit);
 
                 SupplierItem supplierItem = supplierItemDao.findById(dto.getItemId());
+                //去除了分销商的角色，无需计算分销佣金
                 //查询参与出价的所有用户所对应的分销商,可以平分成交额的3%的利润
-                List<AuctionRecord> auctionRecordList = auctionRecordDao.findByItemId(dto.getItemId());
+              /*  List<AuctionRecord> auctionRecordList = auctionRecordDao.findByItemId(dto.getItemId());
                 List<AuctionRecord> filterRecordList = auctionRecordList.stream()
                         .filter(StringUtil.distinctByKey(AuctionRecord::getDistributorId))
                         .filter(a -> a.getDistributorId().longValue() != firstAuctionRecord.getDistributorId())
@@ -351,7 +352,7 @@ public class DistributionOrderServiceImpl implements DistributionOrderService {
                                 "元，您预计获得利润" + PriceUtil.convertDoubleToString(Math.floor(averageProfit)) + "元。请前往"+ url + "查看";
                         aliSmsSender.sendSms(record.getDistributorId(), msg);
                     }
-                }
+                }*/
                 //把该拍卖配置信息改为已处理, 拍品状态为"中拍未付款"
                 auctionConfigDao.setDeal(dto.getItemId(), AuctionEnum.StateEnum.GET_NOT_PAY.getCode());
                 //发送中拍信息给用户

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

@@ -32,7 +32,7 @@ public class DistributorProfitServiceImpl implements DistributorProfitService {
 
     @Override
     public Double getIntroduceRebate(FollowFansRecordRequestDto dto) {
-        double rebate = 0;
+        double rebate = 0.3;
         try {
             FollowFansRecord followFansRecord = followFansRecordDao.findOne(dto);
             if (followFansRecord == null) {

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

@@ -66,6 +66,8 @@ public class SupplierItemServiceImpl implements SupplierItemService {
 
     private static final Logger logger = LoggerFactory.getLogger(SupplierItemServiceImpl.class);
 
+    private static final String APPEND_IMAGE_URL = "https://cdn.wanwudezhi.com/seller-admin/image/MTY1MzQ2OTY1MjE2MQ==269_654x100.png";
+
     @Autowired
     SupplierItemDao supplierItemDao;
 
@@ -139,6 +141,7 @@ public class SupplierItemServiceImpl implements SupplierItemService {
     CollectorWhiteListDao collectorWhiteListDao;
 
 
+
     @Override
     public Result findList(SupplierItemRequestDto dto) {
         try {
@@ -657,6 +660,7 @@ public class SupplierItemServiceImpl implements SupplierItemService {
                     "奖励则归属于第一个分享给买家的分销商。（举例：某拍品最终成拍价是1000元，" +
                     "有4个分销商参与分销，则中拍买家的分销商分得30元佣金，其余3个分销商每人分得10元佣金）");
             auctionDetailVo.setDescription(supplierItem.getDescription());
+            auctionDetailVo.setAppendImageUrl(APPEND_IMAGE_URL);
             //是否延迟截拍的标识
             if (!auctionConfig.getEndTime().equals(auctionConfig.getRealEndTime())) {
                 auctionDetailVo.setIsExtend(true);
@@ -799,8 +803,10 @@ public class SupplierItemServiceImpl implements SupplierItemService {
             SupplierItem supplierItem = supplierItemDao.findById(itemId);
             if (supplierItem.getIsOnSale()) {
                 supplierItemVo.setPostType(DistributionEnum.PostTypeEnum.SALE.getCode());
+                supplierItemVo.setAppendImageUrl(APPEND_IMAGE_URL);
             } else if (!supplierItem.getIsOnSale() && supplierItem.getStock() == 0) {
                 supplierItemVo.setPostType(DistributionEnum.PostTypeEnum.SALE.getCode());
+                supplierItemVo.setAppendImageUrl(APPEND_IMAGE_URL);
             } else {
                 supplierItemVo.setPostType(DistributionEnum.PostTypeEnum.COMMON.getCode());
             }