藏品详情加上个人简介

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

@@ -211,6 +211,11 @@ public class SupplierItemVo implements Entity {
      */
     private String creatorAvatar;
 
+    /**
+     * 藏品上传人简介
+     */
+    private String creatorProfile;
+
     /**
      * 收藏数
      */

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

@@ -540,10 +540,6 @@ public class SendMsgServiceImpl implements SendMsgService {
         return Result.failed();
     }
 
-    @Override
-    public Result noticeToFollowerMsg(AuctionOfferNoticeMsg auctionOfferNoticeMsg) {
-        return null;
-    }
 
     @Override
     public String getOpenIdByUserId(long userId) {
@@ -561,7 +557,6 @@ public class SendMsgServiceImpl implements SendMsgService {
     }
 
 
-
     /**
      * 商品上新通知
      * @param auctionOfferNoticeMsg

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

@@ -18,6 +18,7 @@ import com.wwdz.ch.db.dao.distribution.*;
 import com.wwdz.ch.db.domain.CollectionBookSort;
 import com.wwdz.ch.db.domain.FollowFansRecord;
 import com.wwdz.ch.db.domain.Switch;
+import com.wwdz.ch.db.domain.User;
 import com.wwdz.ch.db.domain.distribution.*;
 import com.wwdz.ch.db.dto.request.FollowFansRecordRequestDto;
 import com.wwdz.ch.db.dto.request.distribution.*;
@@ -718,9 +719,11 @@ public class SupplierItemServiceImpl implements SupplierItemService {
             supplierItemVo.setItemId(supplierItem.getId());
             supplierItemVo.setDistributionPrice(PriceUtil.convertPriceFenToYuan(supplierItem.getDistributionPrice()));
             supplierItemVo.setHomePageImage(MediaUtil.getHomePageImage(supplierItem.getImages(), supplierItem.getVideos()));
-            supplierItemVo.setCreatorName(cacheUtil.getAppletUserNameById(supplierItem.getCreatorId()));
-            String avatar = cacheUtil.getAppletUserById(supplierItem.getCreatorId()).getAvatar();
+            User creator = cacheUtil.appletUserInfoCache.get(supplierItem.getCreatorId()).get();
+            supplierItemVo.setCreatorName(creator.getNickname());
+            String avatar = creator.getAvatar();
             supplierItemVo.setCreatorAvatar(StringUtils.isEmpty(avatar) ? CommConsts.DEFAULT_AVATAR_URL : avatar);
+            supplierItemVo.setCreatorProfile(creator.getProfile());
             //查询藏品被收藏的次数
             long countNum = itemCollectedRecordDao.countByItemId(itemId);
             supplierItemVo.setCollectedNum((int) countNum);

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

@@ -74,12 +74,5 @@ public interface SendMsgService {
     Result followNoticeMsg(FollowFansMsg followFansMsg);
 
 
-    /**
-     * 通知被关注人
-     * @param auctionOfferNoticeMsg
-     * @return
-     */
-    Result noticeToFollowerMsg(AuctionOfferNoticeMsg auctionOfferNoticeMsg);
-
     String getOpenIdByUserId(long userId);
 }

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

@@ -99,6 +99,17 @@ public class FollowFansRecordController {
     }
 
 
+    @ApiOperation(value = "查询我推荐的列表明细")
+    @PostMapping("/findRecommendDetail")
+    public Result findRecommendDetail(@RequestBody FollowFansRecordRequestDto dto) {
+        logger.info("查询我推荐的列表明细,请求参数:{}", JSON.toJSONString(dto));
+        if (dto.getSearchTargetId() == null) {
+            return Result.failed(ResultCode.PARAM_ERROR);
+        }
+        return followFansRecordService.findRecommendDetail(dto);
+    }
+
+
     @ApiOperation(value = "查询分佣明细")
     @PostMapping("/introduceAmountDetail")
     public Result introduceAmountDetail(@RequestBody FollowFansRecordRequestDto dto) {

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

@@ -234,6 +234,35 @@ public class DistributionOrderController {
     }
 
 
+
+    @ApiOperation(value = "藏馆订单列表查询")
+    @PostMapping("/findOrderOfCollector")
+    public Result findOrderOfCollector(@RequestBody DistributionOrderRequestDto dto) {
+        logger.info("藏馆订单列表查询,请求参数:{}", JSON.toJSONString(dto));
+        Validator validator = new Validator(FormHandler.ofEntity(dto));
+        validator.set("sellerId", "卖家id").must().number()
+                .end();
+        if (!validator.isValid()) {
+            return Result.failed(validator.getErrorInfo());
+        }
+        return distributionOrderService.findOrderOfCollector(dto);
+    }
+
+
+    @ApiOperation(value = "查询藏馆订单详情")
+    @PostMapping("/findOrderDetailOfCollector")
+    public Result findOrderDetailOfCollector(@RequestBody DistributionOrderRequestDto dto) {
+        logger.info("查询藏馆订单详情,请求参数:{}", JSON.toJSONString(dto));
+        Validator validator = new Validator(FormHandler.ofEntity(dto));
+        validator.set("distributionOrderId", "订单号").must().string()
+                .end();
+        if (!validator.isValid()) {
+            return Result.failed(validator.getErrorInfo());
+        }
+        return distributionOrderService.findOrderDetailOfCollector(dto);
+    }
+
+
     @ApiOperation(value = "订单退款")
     @PostMapping("/refund")
     public Result refund(@RequestBody DistributionOrderRequestDto dto) {