add cid

mall-service/src/main/java/com/txz/mall/dao/StoreCombinationMapper.java

@@ -14,4 +14,7 @@ public interface StoreCombinationMapper extends Mapper<StoreCombination> {
     
     @UpdateProvider(type = StoreCombinationMapperImpl.class, method = "updateCombinationByProductId")
     int updateCombinationByProductId(StoreProductAddRequest request);
+    
+    @SelectProvider(type = StoreCombinationMapperImpl.class, method = "getIdByProductId")
+    Long getIdByProductId(Long productId);
 }

mall-service/src/main/java/com/txz/mall/dao/impl/StoreCombinationMapperImpl.java

@@ -21,4 +21,10 @@ public class StoreCombinationMapperImpl {
             ;
         }}.toString();
     }
+    
+    public String getIdByProductId(Long productId) {
+        String sql = "select id from m_store_combination where product_id = #{productId} and is_delete = 0 and start_time < now() and stop_time > now() order by start_time limit 1 ";
+        return sql;
+    }
+    
 }

mall-service/src/main/java/com/txz/mall/service/impl/StoreProductServiceImpl.java

@@ -145,6 +145,8 @@ public class StoreProductServiceImpl extends AbstractService<StoreProduct> imple
         //            List<Integer> ids = storeProductCoupons.stream().map(StoreProductCoupon::getIssueCouponId).collect(Collectors.toList());
         //            storeProductResponse.setCouponIds(ids);
         //        }
+        Long cid = combinationMapper.getIdByProductId(storeProduct.getId());
+        storeProductResponse.setCid(cid);
         return storeProductResponse;
     }
     

mall-service/src/main/java/vo/StoreProductInfoVO.java

@@ -16,158 +16,163 @@ import java.util.List;
 @Accessors(chain = true)
 @ApiModel(value = "StoreProductInfoResponse对象", description = "商品详情响应对象")
 public class StoreProductInfoVO implements Serializable {
-
+    
     private static final long serialVersionUID = 9215241889318610262L;
-
+    
     @ApiModelProperty(value = "商品id")
     private Long id;
-
+    
     @ApiModelProperty(value = "商品图片")
     private String image;
-
+    
     @ApiModelProperty(value = "轮播图")
     private String sliderImage;
-
+    
     @ApiModelProperty(value = "商品名称")
     private String storeName;
-
+    
     @ApiModelProperty(value = "商品简介")
     private String storeInfo;
-
+    
     @ApiModelProperty(value = "关键字")
     private String keyword;
-
+    
     @ApiModelProperty(value = "分类id")
     private String cateId;
-
+    
     @ApiModelProperty(value = "分类中文")
     private String cateStr;
-
+    
     @ApiModelProperty(value = "单位名")
     private String unitName;
-
+    
     @ApiModelProperty(value = "排序")
     private Integer sort;
-
+    
     @ApiModelProperty(value = "是否热卖")
     private Integer isHot;
-
+    
     @ApiModelProperty(value = "是否优惠")
     private Integer isBenefit;
-
+    
     @ApiModelProperty(value = "是否精品")
     private Integer isBest;
-
+    
     @ApiModelProperty(value = "是否新品")
     private Integer isNew;
-
+    
     @ApiModelProperty(value = "获得积分")
     private Integer giveIntegral;
-
+    
     @ApiModelProperty(value = "是否优品推荐")
     private Integer isGood;
-
+    
     @ApiModelProperty(value = "是否单独分佣")
     private Integer isSub;
-
+    
     @ApiModelProperty(value = "虚拟销量")
     private Integer ficti;
-
+    
     @ApiModelProperty(value = "运费模板ID")
     private Integer tempId;
-
+    
     @ApiModelProperty(value = "规格 0单 1多")
     private Integer specType;
-
+    
     @ApiModelProperty(value = "活动显示排序 0=默认，1=秒杀，2=砍价，3=拼团")
     private List<String> activity;
-
+    
     @ApiModelProperty(value = "商品属性")
     private List<AttrVO> attr;
-
+    
     @ApiModelProperty(value = "商品属性详情")
     private List<AttrValueVO> attrValue;
-
+    
     @ApiModelProperty(value = "商品描述")
     private String content;
-
+    
     @ApiModelProperty(value = "产品ID")
     private Integer productId;
-
+    
     @ApiModelProperty(value = "优惠券Ids")
     private List<Integer> couponIds;
-
+    
     // 以下为活动商品部分
-
+    
     @ApiModelProperty(value = "状态 0=关闭 1=开启|营销商品用")
     private Integer status;
-
+    
     @ApiModelProperty(value = "运费模板ID|秒杀商品专用")
     private Integer timeId;
-
+    
     @ApiModelProperty(value = "秒杀开启时间|秒杀专用")
     private String startTimeStr;
-
+    
     @ApiModelProperty(value = "秒杀结束时间|秒杀专用")
     private String stopTimeStr;
-
+    
     @ApiModelProperty(value = "当天参与秒杀次数|秒杀专用")
     private Integer num;
-
+    
     @ApiModelProperty(value = "砍价开启时间|砍价专用")
     private Long startTime;
-
+    
     @ApiModelProperty(value = "砍价结束时间|砍价专用")
     private Long stopTime;
-
+    
     @ApiModelProperty(value = "砍价活动名称|砍价专用")
     private String title;
-
+    
     @ApiModelProperty(value = "帮砍次数|砍价专用")
     private Integer bargainNum;
-
+    
     @ApiModelProperty(value = "帮助砍价好友人数|砍价专用")
     private Integer peopleNum;
-
+    
     @ApiModelProperty(value = "拼团订单有效时间(小时)|拼团专用")
     private Integer effectiveTime;
-
+    
     @ApiModelProperty(value = "每个订单可购买数量|拼团专用")
     private Integer onceNum;
-
+    
     @ApiModelProperty(value = "虚拟成团百分比|拼团专用")
     private Integer virtualRation;
-
+    
     @ApiModelProperty(value = "参团人数|拼团专用")
     private Integer people;
-
+    
     @ApiModelProperty(value = "简介|拼团专用")
     private String info;
-
+    
     @ApiModelProperty(value = "展示图")
     private String flatPattern;
-
+    
     @ApiModelProperty("品牌")
     private String itemBrand;
-
+    
     @ApiModelProperty("货号")
     private String itemNumber;
-
+    
     @ApiModelProperty(value = "商品价格")
     private BigDecimal price;
-
+    
     @ApiModelProperty(value = "市场价")
     private BigDecimal otPrice;
-
+    
     @ApiModelProperty(value = "库存")
     private Integer stock;
-
+    
     @ApiModelProperty(value = "状态 （0：未上架，1：上架）")
     private Integer isShow;
-
+    
     @ApiModelProperty("供应商")
     private String itemSupplier;
-
+    
     @ApiModelProperty(value = "销量")
     private Integer sales;
+    
+    /**
+     * 拼团商品id
+     */
+    private Long cid;
 }