缺失字段补充

ch-core/src/main/java/com/wwdz/ch/core/consts/CommConsts.java

@@ -40,6 +40,11 @@ public interface CommConsts {
 
 	public static final Long SYSTEM_ACCOUNT = 8888888888L;
 
+	/**
+	 * 系统默认用户头像URL
+	 */
+	public static final String DEFAULT_AVATAR_URL = "https://cdn.wanwudezhi.com/mall-portal/image/4337400862";
+
 
 
 }

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

@@ -220,4 +220,14 @@ public class SupplierItemVo implements Entity {
      * 收藏人头像
      */
     private List<String> collectorsAvatar;
+
+    /**
+     * 当前用户是否已收藏
+     */
+    private Boolean isCollected;
+
+    /**
+     * 当前用户是否已分享过
+     */
+    private Boolean isShared;
 }

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

@@ -68,4 +68,5 @@ public interface DistributorShareRecordDao {
      */
     DistributorShareRecord findItemShareRecordByDistributorId(long distributorId, long itemId);
 
+
 }

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

@@ -37,6 +37,7 @@ public class DistributorShareRecordDaoImpl implements DistributorShareRecordDao
         DistributorShareRecordExample.Criteria criteria = example.createCriteria();
         JdbcHelper.ifPresent(dto.getDistributorIdList(), criteria::andDistributorIdIn);
         JdbcHelper.ifPresent(dto.getItemIdList(), criteria::andItemIdIn);
+        JdbcHelper.ifPresent(dto.getType(), criteria::andTypeEqualTo);
         criteria.andEnabledEqualTo(true);
         return distributorShareRecordMapper.selectByExample(example);
     }

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

@@ -86,12 +86,17 @@ public class SupplierItemDaoImpl implements SupplierItemDao {
     public List<SupplierItem> findForHomePage(SupplierItemRequestDto dto) {
         SupplierItemExample supplierItemExample = new SupplierItemExample();
         SupplierItemExample.Criteria criteria = supplierItemExample.createCriteria();
-        JdbcHelper.ifPresent(dto.getId(), criteria::andIdEqualTo);
-        JdbcHelper.ifPresent(dto.getIds(), criteria::andIdIn);
-        JdbcHelper.ifPresent(dto.getType(), criteria::andTypeEqualTo);
-        JdbcHelper.ifPresent(dto.getStock(), criteria::andStockGreaterThan);
-        JdbcHelper.ifPresent(dto.getIsOnSale(), criteria::andIsOnSaleEqualTo);
-        JdbcHelper.ifPresent(dto.getIsDeleted(), criteria::andIsDeletedEqualTo);
+        criteria.andCreatorIdIn(dto.getCreatorIdList());
+        criteria.andTypeIn(dto.getTypeList());
+        criteria.andStockGreaterThan(0);
+        criteria.andIsDeletedEqualTo(false);
+        criteria.andIsOnSaleEqualTo(true);
+        SupplierItemExample.Criteria orCriteria = supplierItemExample.or();
+        orCriteria.andIdIn(dto.getIds());
+        orCriteria.andTypeIn(dto.getTypeList());
+        orCriteria.andStockGreaterThan(0);
+        orCriteria.andIsDeletedEqualTo(false);
+        orCriteria.andIsOnSaleEqualTo(true);
         supplierItemExample.setOrderByClause(" update_time desc");
         PageHelper.startPage(dto.getPage(), dto.getLimit());
         return supplierItemMapper.selectByExampleWithBLOBs(supplierItemExample);

ch-wx-api/src/main/java/com/wwdz/ch/wx/api/OfficialAccountCallbackController.java

@@ -38,6 +38,10 @@ public class OfficialAccountCallbackController {
 
     private final static String UNSUBSCRIBE_EVENT = "unsubscribe";
 
+    //一次性订阅消息
+    private final static String SUBSCRIBE_MSG_POPUP_EVENT = "subscribe_msg_popup_event";
+
+
     @Value("${dts.wx.officialaccount-token}")
     private String OFFICIALACCOUNTTOKEN;
 
@@ -122,7 +126,12 @@ public class OfficialAccountCallbackController {
                     officialAccountSubscribeRecord.setPlatformType(OfficalAccountEnum.PlatformTypeEnum.WECHAT.getCode());
                     officialAccountSubscribeRecordService.insert(officialAccountSubscribeRecord);
                 }
-                logger.info("=============== 更新订阅记录成功 ==============");
+                logger.info("=============== 更新订阅公众号记录成功 ==============");
+            }  else if (SUBSCRIBE_MSG_POPUP_EVENT.equals(event)) {
+                //一次性订阅消息
+
+
+
             }
         } catch (Exception e) {
             logger.error("微信公众号通知回调接口 error : {}", e);

ch-wx-api/src/main/java/com/wwdz/ch/wx/service/distribution/SupplierItemService.java

@@ -87,6 +87,6 @@ public interface SupplierItemService {
      * @param dto
      * @return
      */
-    Result homePage(SupplierItemRequestDto dto);
+    Result findHomePage(SupplierItemRequestDto dto);
 
 }

ch-wx-api/src/main/java/com/wwdz/ch/wx/web/distribution/SupplierItemController.java

@@ -131,4 +131,14 @@ public class SupplierItemController {
         return supplierItemService.delete(dto);
     }
 
+
+    @ApiOperation(value = "查询主页列表")
+    @PostMapping("/findHomePage")
+    public Result findHomePage(@RequestBody SupplierItemRequestDto dto) {
+        logger.info("删除用户查询主页列表藏品,请求参数:{}", JSON.toJSONString(dto));
+        if (dto.getId() == null) {
+            return Result.failed(ResultCode.PARAM_ERROR);
+        }
+        return supplierItemService.findHomePage(dto);
+    }
 }