Merge branch 'develop'

csf-common/csf-common-model/src/main/java/com/mmc/csf/release/forum/vo/DynamicVO.java

@@ -91,5 +91,11 @@ public class DynamicVO implements Serializable {
   @ApiModelProperty(value = "关注状态")
   private Boolean status;
 
+  @ApiModelProperty(value = "商品id")
+  private Integer goodsId;
+
+
+  @ApiModelProperty(value = "关联商品")
+  private MallGoodsVO mallGoodsVO;
 
 }

csf-common/csf-common-model/src/main/java/com/mmc/csf/release/forum/vo/GoodsResourcesVO.java

+package com.mmc.csf.release.forum.vo;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+@Builder
+public class GoodsResourcesVO {
+
+    @ApiModelProperty(value = "id")
+    private Integer id;
+    @ApiModelProperty(value = "url")
+    private String url;
+    @ApiModelProperty(value = "类型：0主图 1副图 2视频")
+    private Integer type;
+
+}

csf-common/csf-common-model/src/main/java/com/mmc/csf/release/forum/vo/MallGoodsVO.java

+package com.mmc.csf.release.forum.vo;
+
+import com.mmc.csf.release.model.group.Create;
+import com.mmc.csf.release.model.group.Update;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotEmpty;
+import javax.validation.constraints.NotNull;
+import java.io.Serializable;
+import java.util.Date;
+import java.util.List;
+
+@Data
+@NoArgsConstructor
+@AllArgsConstructor
+@Builder
+public class MallGoodsVO implements Serializable {
+
+    @ApiModelProperty(value = "id", example = "1")
+    @NotNull(message = "id不能为空", groups = {Update.class})
+    private Integer id;
+
+    @ApiModelProperty(value = "商品名称", example = "这是商品名称", required = true)
+    @NotBlank(message = "商品名称不能为空", groups = {Update.class, Create.class})
+    private String tradeName;
+
+    @ApiModelProperty(value = "商品描述", example = "商品描述", required = true)
+    @NotBlank(message = "商品描述不能为空", groups = {Update.class, Create.class})
+    private String description;
+
+    @ApiModelProperty(value = "商品资源:图片or视频及其他")
+    @NotEmpty(message = "图片不能为空")
+    private List<GoodsResourcesVO> resourcesList;
+
+    @ApiModelProperty(value = "商品状态", example = "1", required = true)
+    @NotNull(message = "商品状态不能为空", groups = {Update.class, Create.class})
+    private Integer shelfStatus;
+
+    @ApiModelProperty(value = "商品标签")
+    private String goodsLabel;
+
+    @ApiModelProperty(value = "价格是否显示 0不显示 1显示")
+    private Integer priceShow;
+
+    @ApiModelProperty(value = "标签是否显示 0否 1是")
+    private Integer labelShow;
+
+    @ApiModelProperty(value = "是否推荐 0否 1是")
+    private Integer recommend;
+
+    @ApiModelProperty(value = "商品详情 富文本")
+    private String goodsDetails;
+
+    @ApiModelProperty(value = "创建时间 用作列表回显")
+    private Date createTime;
+
+    @ApiModelProperty(value = "店铺id 小程序用")
+    private Integer userAccountId;
+
+    @ApiModelProperty(value = "单位名称")
+    private String companyName;
+
+    @ApiModelProperty(value = "关联话题id")
+    private Integer gambitId;
+
+}

kustomization/overlays/dev/kustomization.yaml

@@ -18,4 +18,4 @@ patches:
 images:
 - name: REGISTRY/NAMESPACE/IMAGE:TAG
   newName: mmc-registry.cn-shenzhen.cr.aliyuncs.com/sharefly-dev/ims
-  newTag: 3de1751c306c55dad5a29bc671cfc8a86aeea599
+  newTag: b86f24c56a50382039e5f18fbc18732636f94004

release-service/src/main/java/com/mmc/csf/release/entity/forum/ForumDynamicDO.java

@@ -93,6 +93,10 @@ public class ForumDynamicDO extends BaseDO implements Serializable {
 
     @ApiModelProperty("话题id")
     private Integer gambitId;
+
+    @ApiModelProperty(value = "商品id")
+    private Integer goodsId;
+
     public ForumDynamicDO(DynamicVO dynamicVO) {
         this.gambitIcon=dynamicVO.getGambitIcon();
         this.gambitCover=dynamicVO.getGambitCover();
@@ -101,6 +105,7 @@ public class ForumDynamicDO extends BaseDO implements Serializable {
         this.location = dynamicVO.getLocation();
         this.lat = dynamicVO.getLat();
         this.lon = dynamicVO.getLon();
+        this.goodsId = dynamicVO.getGoodsId();
     }
 
     public DynamicVO buildDynamicVO() {

release-service/src/main/java/com/mmc/csf/release/feign/PmsAppApi.java

 package com.mmc.csf.release.feign;
 
+import com.mmc.csf.common.util.web.ResultBody;
 import com.mmc.csf.release.feign.hystrix.PmsAppApHystrix;
 import com.mmc.csf.release.flyer.dto.AllCategoryDTO;
+import com.mmc.csf.release.forum.vo.MallGoodsVO;
 import com.mmc.csf.release.industry.IndustryTypeDTO;
 import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.bind.annotation.RequestParam;
@@ -23,4 +26,8 @@ public interface PmsAppApi {
     public IndustryTypeDTO feignQquerygetIndustryTypeById(@RequestParam Integer id);
 
 
+    //根据商品id 查找商品信息
+    @RequestMapping(value = "/pms/mall/goods/mallGoodsDetails", method = RequestMethod.GET)
+    ResultBody<MallGoodsVO> mallGoodsDetails(@RequestParam Integer id);
+
 }

release-service/src/main/java/com/mmc/csf/release/feign/hystrix/PmsAppApHystrix.java

 package com.mmc.csf.release.feign.hystrix;
 
+import com.mmc.csf.common.util.web.ResultBody;
 import com.mmc.csf.release.feign.PmsAppApi;
 import com.mmc.csf.release.flyer.dto.AllCategoryDTO;
+import com.mmc.csf.release.forum.vo.MallGoodsVO;
 import com.mmc.csf.release.industry.IndustryTypeDTO;
 import lombok.extern.slf4j.Slf4j;
+import org.springframework.web.bind.annotation.RequestBody;
 
 import java.util.List;
 
@@ -24,4 +27,10 @@ public class PmsAppApHystrix implements PmsAppApi {
         log.info("熔断--feignQquerygetIndustryTypeById:" + id);
         return null;
     }
+
+    @Override
+    public ResultBody<MallGoodsVO> mallGoodsDetails(Integer id) {
+        log.info("熔断--mallGoodsDetails:");
+        return null;
+    }
 }

release-service/src/main/java/com/mmc/csf/release/service/impl/DynamicServiceImpl.java

@@ -13,6 +13,7 @@ import javax.servlet.http.HttpServletRequest;
 
 import com.mmc.csf.common.util.redis.RedisConstant;
 import com.mmc.csf.infomation.dto.UserBaseInfoDTO;
+import com.mmc.csf.release.feign.PmsAppApi;
 import com.mmc.csf.release.util.SmsUtil;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.collections4.CollectionUtils;
@@ -77,6 +78,9 @@ public class DynamicServiceImpl implements DynamicService {
     @Autowired
     private StringRedisTemplate stringRedisTemplate;
 
+    @Autowired
+    private PmsAppApi pmsAppApi;
+
     @Value("${iuav.userapp.url}")
     private String userApp;
 
@@ -308,6 +312,7 @@ public class DynamicServiceImpl implements DynamicService {
 
         userBaseInfoVO.setNickName(userAccountSimpleDTO.getNickName());
         userBaseInfoVO.setUserImg(userAccountSimpleDTO.getUserImg());
+        userBaseInfoVO.setIsPilot(userAccountSimpleDTO.getIsPilot());
         dynamicVO.setUserBaseInfo(userBaseInfoVO);
         dynamicVO.setLikes(liked);
         ForumReviewVO forumReviewVO = gambitDao.selectForumReviewMessage(dynamicId);
@@ -580,7 +585,16 @@ public class DynamicServiceImpl implements DynamicService {
                 dynamicVO.setStatus(null);
             }
         }
-        return PageResult.buildPage(pageNo, pageSize, count, dynamicVOList);
+
+        // 帖子id 获取商品id
+        List<DynamicVO> collect = dynamicVOList.stream().map(item -> {
+            Integer goodsId = item.getGoodsId();
+            MallGoodsVO result = pmsAppApi.mallGoodsDetails(goodsId).getResult();
+            item.setMallGoodsVO(result);
+            return item;
+        }).collect(Collectors.toList());
+
+        return PageResult.buildPage(pageNo, pageSize, count, collect);
     }
     @Override
     public ResultBody recentNewsList(Integer userAccountId) {

release-service/src/main/resources/mapper/forum/DynamicMapper.xml

@@ -62,8 +62,8 @@
     </insert>
     <insert id="insertDynamic" keyProperty="id" useGeneratedKeys="true"
             parameterType="com.mmc.csf.release.entity.forum.ForumDynamicDO">
-        INSERT INTO forum_dynamic(user_account_id, description, location, lat, lon, root_path, check_status)
-        VALUES (#{userAccountId}, #{description}, #{location}, #{lat}, #{lon}, #{rootPath}, #{checkStatus})
+        INSERT INTO forum_dynamic(user_account_id, description, location, lat, lon, root_path, check_status, goods_id)
+        VALUES (#{userAccountId}, #{description}, #{location}, #{lat}, #{lon}, #{rootPath}, #{checkStatus}, #{goodsId})
     </insert>
     <insert id="insertforumGambit" parameterType="com.mmc.csf.release.entity.gambit.ForumGambitDO" keyProperty="id" useGeneratedKeys="true">
         insert into forum_gambit(gambit_name,gambit_icon,gambit_cover,