商品列表2

ch-admin-api/src/main/java/com/wwdz/ch/admin/controller/SysSupplierItemController.java

@@ -33,7 +33,6 @@ public class SysSupplierItemController {
         logger.info("新增商品,请求参数:{}", JSON.toJSONString(dto));
         Validator validator = new Validator(FormHandler.ofEntity(dto));
         validator.set("name", "商品名称").must().string()
-                .set("distributionPrice", "商品供货价").must().string()
                 .set("type", "商品类型").must().number()
                 .set("buyLimitNum", "限购数量").must().number()
                 .end();

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

@@ -165,22 +165,22 @@ public class SupplierItemServiceImpl implements SupplierItemService {
             }
             SupplierItem supplierItem = supplierItemDao.findById(itemId);
             SupplierItemVo supplierItemVo = new SupplierItemVo();
+
+            //做浏览记录
+            boolean flag = userRecentBrowseDao.isExisted(dto.getUserId(),distributorShareRecord.getDistributorId());
+            if (!flag) {
+                UserRecentBrowse newRecord = new UserRecentBrowse();
+                newRecord.setShareRecordId(dto.getShareRecordId());
+                newRecord.setSharerId(distributorShareRecord.getDistributorId());
+                newRecord.setUserId(dto.getUserId());
+                newRecord.setCreateTime(new Date());
+                newRecord.setUpdateTime(new Date());
+                newRecord.setType(DistributionEnum.UserBrowseTypeEnum.PLATFORM_ITEM.getCode());
+                userRecentBrowseDao.insert(newRecord);
+            }
             //用户点击链接进入详情页需要记录
             if (!dto.getIsShop()) {
                 supplierItemVo.setSalePrice(PriceUtil.convertPriceFenToYuan(distributorShareRecord.getPrice()));
-                itemId = distributorShareRecord.getItemId();
-                //做浏览记录
-                boolean flag = userRecentBrowseDao.isExisted(dto.getUserId(),distributorShareRecord.getDistributorId());
-                if (!flag) {
-                    UserRecentBrowse newRecord = new UserRecentBrowse();
-                    newRecord.setShareRecordId(dto.getShareRecordId());
-                    newRecord.setSharerId(distributorShareRecord.getDistributorId());
-                    newRecord.setUserId(dto.getUserId());
-                    newRecord.setCreateTime(new Date());
-                    newRecord.setUpdateTime(new Date());
-                    newRecord.setType(DistributionEnum.UserBrowseTypeEnum.PLATFORM_ITEM.getCode());
-                    userRecentBrowseDao.insert(newRecord);
-                }
             }  else {
                 //店家进入详情，需要判断是否购买过样品
                 if (distributionOrderDao.isBuyItem(dto.getUserId(), itemId)) {
@@ -380,22 +380,20 @@ public class SupplierItemServiceImpl implements SupplierItemService {
                 itemId = dto.getId();
             }
             //保存浏览记录
-            if (!dto.getIsShop()) {
-                //做浏览记录
-                boolean flag = userRecentBrowseDao.isExisted(dto.getUserId(), distributorShareRecord.getDistributorId());
-                if (!flag) {
-                    UserRecentBrowse newRecord = new UserRecentBrowse();
-                    newRecord.setShareRecordId(dto.getShareRecordId());
-                    newRecord.setSharerId(distributorShareRecord.getDistributorId());
-                    newRecord.setUserId(dto.getUserId());
-                    newRecord.setCreateTime(new Date());
-                    newRecord.setUpdateTime(new Date());
-                    newRecord.setType(DistributionEnum.UserBrowseTypeEnum.PLATFORM_ITEM.getCode());
-                    userRecentBrowseDao.insert(newRecord);
-                }
+            //做浏览记录
+            boolean flag = userRecentBrowseDao.isExisted(dto.getUserId(), distributorShareRecord.getDistributorId());
+            if (!flag) {
+                UserRecentBrowse newRecord = new UserRecentBrowse();
+                newRecord.setShareRecordId(dto.getShareRecordId());
+                newRecord.setSharerId(distributorShareRecord.getDistributorId());
+                newRecord.setUserId(dto.getUserId());
+                newRecord.setCreateTime(new Date());
+                newRecord.setUpdateTime(new Date());
+                newRecord.setType(DistributionEnum.UserBrowseTypeEnum.PLATFORM_ITEM.getCode());
+                userRecentBrowseDao.insert(newRecord);
             }
 
-            //查询商品竞拍信息
+        //查询商品竞拍信息
             AuctionConfig auctionConfig = auctionConfigDao.findByItemId(itemId);
             //查询商品竞拍记录
             AuctionRecordRequestDto auctionRecordRequestDto = new AuctionRecordRequestDto();