优化代码

java110-bean/src/main/java/com/java110/dto/groupBuyProduct/GroupBuyProductDto.java

@@ -1,7 +1,9 @@
 package com.java110.dto.groupBuyProduct;
 
 import com.java110.dto.PageDto;
+import com.java110.dto.groupBuyProductSpec.GroupBuyProductSpecDto;
 import com.java110.dto.product.ProductDto;
+import com.java110.dto.productSpecValue.ProductSpecValueDto;
 
 import java.io.Serializable;
 import java.util.Date;
@@ -27,6 +29,8 @@ public class GroupBuyProductDto extends ProductDto implements Serializable {
     private String storeId;
     private String batchId;
 
+    private List<GroupBuyProductSpecDto> groupBuyProductSpecs;
+
 
 
 
@@ -125,4 +129,11 @@ public class GroupBuyProductDto extends ProductDto implements Serializable {
     }
 
 
+    public List<GroupBuyProductSpecDto> getGroupBuyProductSpecs() {
+        return groupBuyProductSpecs;
+    }
+
+    public void setGroupBuyProductSpecs(List<GroupBuyProductSpecDto> groupBuyProductSpecs) {
+        this.groupBuyProductSpecs = groupBuyProductSpecs;
+    }
 }

java110-bean/src/main/java/com/java110/dto/groupBuyProductSpec/GroupBuyProductSpecDto.java

@@ -1,6 +1,7 @@
 package com.java110.dto.groupBuyProductSpec;
 
 import com.java110.dto.PageDto;
+import com.java110.dto.productSpecValue.ProductSpecValueDto;
 
 import java.io.Serializable;
 import java.util.Date;
@@ -13,7 +14,7 @@ import java.util.Date;
  * @Version 1.0
  * add by wuxw 2019/4/24
  **/
-public class GroupBuyProductSpecDto extends PageDto implements Serializable {
+public class GroupBuyProductSpecDto extends ProductSpecValueDto implements Serializable {
 
     private String specId;
     private String groupSales;

java110-db/src/main/resources/mapper/goods/GroupBuyProductServiceDaoImplMapper.xml

@@ -5,138 +5,137 @@
 <mapper namespace="groupBuyProductServiceDaoImpl">
 
 
-
-
-
     <!-- 保存拼团产品信息 add by wuxw 2018-07-03 -->
     <insert id="saveGroupBuyProductInfo" parameterType="Map">
         insert into group_buy_product(
-group_prod_name,product_id,user_count,group_id,group_prod_desc,sort,state,store_id,batch_id
-) values (
-#{groupProdName},#{productId},#{userCount},#{groupId},#{groupProdDesc},#{sort},#{state},#{storeId},#{batchId}
-)
+        group_prod_name,product_id,user_count,group_id,group_prod_desc,sort,state,store_id,batch_id
+        ) values (
+        #{groupProdName},#{productId},#{userCount},#{groupId},#{groupProdDesc},#{sort},#{state},#{storeId},#{batchId}
+        )
     </insert>
 
 
-
     <!-- 查询拼团产品信息 add by wuxw 2018-07-03 -->
     <select id="getGroupBuyProductInfo" parameterType="Map" resultType="Map">
-        select  t.group_prod_name,t.group_prod_name groupProdName,t.product_id,t.product_id productId,t.user_count,t.user_count userCount,t.group_id,t.group_id groupId,t.group_prod_desc,t.group_prod_desc groupProdDesc,t.status_cd,t.status_cd statusCd,t.sort,t.state,t.store_id,t.store_id storeId,t.batch_id,t.batch_id batchId 
-from group_buy_product t 
-where 1 =1 
-<if test="groupProdName !=null and groupProdName != ''">
-   and t.group_prod_name= #{groupProdName}
-</if> 
-<if test="productId !=null and productId != ''">
-   and t.product_id= #{productId}
-</if> 
-<if test="userCount !=null and userCount != ''">
-   and t.user_count= #{userCount}
-</if> 
-<if test="groupId !=null and groupId != ''">
-   and t.group_id= #{groupId}
-</if> 
-<if test="groupProdDesc !=null and groupProdDesc != ''">
-   and t.group_prod_desc= #{groupProdDesc}
-</if> 
-<if test="statusCd !=null and statusCd != ''">
-   and t.status_cd= #{statusCd}
-</if> 
-<if test="sort !=null and sort != ''">
-   and t.sort= #{sort}
-</if> 
-<if test="state !=null and state != ''">
-   and t.state= #{state}
-</if> 
-<if test="storeId !=null and storeId != ''">
-   and t.store_id= #{storeId}
-</if> 
-<if test="batchId !=null and batchId != ''">
-   and t.batch_id= #{batchId}
-</if> 
-order by t.create_time desc
-<if test="page != -1 and page != null ">
-   limit #{page}, #{row}
-</if> 
+        select t.group_prod_name,t.group_prod_name groupProdName,t.product_id,t.product_id
+        productId,t.user_count,t.user_count userCount,t.group_id,t.group_id groupId,t.group_prod_desc,t.group_prod_desc
+        groupProdDesc,t.status_cd,t.status_cd statusCd,t.sort,t.state,t.store_id,t.store_id
+        storeId,t.batch_id,t.batch_id batchId,p.prod_name prodName,p.prod_desc prodDesc
+        from group_buy_product t
+        inner join product p on t.product_id = p.product_id and p.status_cd = '0' and t.store_id = p.store_id
+        where 1 =1
+        <if test="groupProdName !=null and groupProdName != ''">
+            and t.group_prod_name= #{groupProdName}
+        </if>
+        <if test="productId !=null and productId != ''">
+            and t.product_id= #{productId}
+        </if>
+        <if test="userCount !=null and userCount != ''">
+            and t.user_count= #{userCount}
+        </if>
+        <if test="groupId !=null and groupId != ''">
+            and t.group_id= #{groupId}
+        </if>
+        <if test="groupProdDesc !=null and groupProdDesc != ''">
+            and t.group_prod_desc= #{groupProdDesc}
+        </if>
+        <if test="statusCd !=null and statusCd != ''">
+            and t.status_cd= #{statusCd}
+        </if>
+        <if test="sort !=null and sort != ''">
+            and t.sort= #{sort}
+        </if>
+        <if test="state !=null and state != ''">
+            and t.state= #{state}
+        </if>
+        <if test="storeId !=null and storeId != ''">
+            and t.store_id= #{storeId}
+        </if>
+        <if test="batchId !=null and batchId != ''">
+            and t.batch_id= #{batchId}
+        </if>
+        order by t.create_time desc
+        <if test="page != -1 and page != null ">
+            limit #{page}, #{row}
+        </if>
 
     </select>
 
 
-
-
     <!-- 修改拼团产品信息 add by wuxw 2018-07-03 -->
     <update id="updateGroupBuyProductInfo" parameterType="Map">
-        update  group_buy_product t set t.status_cd = #{statusCd}
-<if test="newBId != null and newBId != ''">
-,t.b_id = #{newBId}
-</if> 
-<if test="groupProdName !=null and groupProdName != ''">
-, t.group_prod_name= #{groupProdName}
-</if> 
-<if test="productId !=null and productId != ''">
-, t.product_id= #{productId}
-</if> 
-<if test="userCount !=null and userCount != ''">
-, t.user_count= #{userCount}
-</if> 
-<if test="groupProdDesc !=null and groupProdDesc != ''">
-, t.group_prod_desc= #{groupProdDesc}
-</if> 
-<if test="sort !=null and sort != ''">
-, t.sort= #{sort}
-</if> 
-<if test="state !=null and state != ''">
-, t.state= #{state}
-</if> 
-<if test="storeId !=null and storeId != ''">
-, t.store_id= #{storeId}
-</if> 
-<if test="batchId !=null and batchId != ''">
-, t.batch_id= #{batchId}
-</if> 
- where 1=1 <if test="groupId !=null and groupId != ''">
-and t.group_id= #{groupId}
-</if> 
+        update group_buy_product t set t.status_cd = #{statusCd}
+        <if test="newBId != null and newBId != ''">
+            ,t.b_id = #{newBId}
+        </if>
+        <if test="groupProdName !=null and groupProdName != ''">
+            , t.group_prod_name= #{groupProdName}
+        </if>
+        <if test="productId !=null and productId != ''">
+            , t.product_id= #{productId}
+        </if>
+        <if test="userCount !=null and userCount != ''">
+            , t.user_count= #{userCount}
+        </if>
+        <if test="groupProdDesc !=null and groupProdDesc != ''">
+            , t.group_prod_desc= #{groupProdDesc}
+        </if>
+        <if test="sort !=null and sort != ''">
+            , t.sort= #{sort}
+        </if>
+        <if test="state !=null and state != ''">
+            , t.state= #{state}
+        </if>
+        <if test="storeId !=null and storeId != ''">
+            , t.store_id= #{storeId}
+        </if>
+        <if test="batchId !=null and batchId != ''">
+            , t.batch_id= #{batchId}
+        </if>
+        where 1=1
+        <if test="groupId !=null and groupId != ''">
+            and t.group_id= #{groupId}
+        </if>
 
     </update>
 
     <!-- 查询拼团产品数量 add by wuxw 2018-07-03 -->
-     <select id="queryGroupBuyProductsCount" parameterType="Map" resultType="Map">
-        select  count(1) count 
-from group_buy_product t 
-where 1 =1 
-<if test="groupProdName !=null and groupProdName != ''">
-   and t.group_prod_name= #{groupProdName}
-</if> 
-<if test="productId !=null and productId != ''">
-   and t.product_id= #{productId}
-</if> 
-<if test="userCount !=null and userCount != ''">
-   and t.user_count= #{userCount}
-</if> 
-<if test="groupId !=null and groupId != ''">
-   and t.group_id= #{groupId}
-</if> 
-<if test="groupProdDesc !=null and groupProdDesc != ''">
-   and t.group_prod_desc= #{groupProdDesc}
-</if> 
-<if test="statusCd !=null and statusCd != ''">
-   and t.status_cd= #{statusCd}
-</if> 
-<if test="sort !=null and sort != ''">
-   and t.sort= #{sort}
-</if> 
-<if test="state !=null and state != ''">
-   and t.state= #{state}
-</if> 
-<if test="storeId !=null and storeId != ''">
-   and t.store_id= #{storeId}
-</if> 
-<if test="batchId !=null and batchId != ''">
-   and t.batch_id= #{batchId}
-</if> 
+    <select id="queryGroupBuyProductsCount" parameterType="Map" resultType="Map">
+        select count(1) count
+        from group_buy_product t
+        where 1 =1
+        <if test="groupProdName !=null and groupProdName != ''">
+            and t.group_prod_name= #{groupProdName}
+        </if>
+        <if test="productId !=null and productId != ''">
+            and t.product_id= #{productId}
+        </if>
+        <if test="userCount !=null and userCount != ''">
+            and t.user_count= #{userCount}
+        </if>
+        <if test="groupId !=null and groupId != ''">
+            and t.group_id= #{groupId}
+        </if>
+        <if test="groupProdDesc !=null and groupProdDesc != ''">
+            and t.group_prod_desc= #{groupProdDesc}
+        </if>
+        <if test="statusCd !=null and statusCd != ''">
+            and t.status_cd= #{statusCd}
+        </if>
+        <if test="sort !=null and sort != ''">
+            and t.sort= #{sort}
+        </if>
+        <if test="state !=null and state != ''">
+            and t.state= #{state}
+        </if>
+        <if test="storeId !=null and storeId != ''">
+            and t.store_id= #{storeId}
+        </if>
+        <if test="batchId !=null and batchId != ''">
+            and t.batch_id= #{batchId}
+        </if>
 
 
-     </select>
+    </select>
 
 </mapper>

java110-db/src/main/resources/mapper/goods/GroupBuyProductSpecServiceDaoImplMapper.xml

@@ -20,8 +20,9 @@
         select t.spec_id,t.spec_id specId,t.group_sales,t.group_sales groupSales,t.product_id,t.product_id
         productId,t.group_price,t.group_price groupPrice,t.default_show,t.default_show
         defaultShow,t.status_cd,t.status_cd statusCd,t.store_id,t.store_id storeId,t.group_stock,t.group_stock
-        groupStock
+        groupStock,ps.spec_name specName
         from group_buy_product_spec t
+        left join product_spec ps on t.spec_id = ps.spec_id and ps.store_id = t.store_id and ps.status_cd = '0'
         where 1 =1
         <if test="specId !=null and specId != ''">
             and t.spec_id= #{specId}

service-goods/src/main/java/com/java110/goods/api/GroupBuyApi.java

@@ -217,7 +217,7 @@ public class GroupBuyApi {
         }
         GroupBuyProductPo groupBuyProductPo = BeanConvertUtil.covertBean(reqJson, GroupBuyProductPo.class);
         groupBuyProductPo.setStoreId(storeId);
-        return saveGroupBuyProductBMOImpl.save(groupBuyProductPo,groupBuyProductSpecPos);
+        return saveGroupBuyProductBMOImpl.save(groupBuyProductPo, groupBuyProductSpecPos);
     }
 
     /**
@@ -274,11 +274,13 @@ public class GroupBuyApi {
     @RequestMapping(value = "/queryGroupBuyProduct", method = RequestMethod.GET)
     public ResponseEntity<String> queryGroupBuyProduct(@RequestHeader(value = "store-id") String storeId,
                                                        @RequestParam(value = "page") int page,
-                                                       @RequestParam(value = "row") int row) {
+                                                       @RequestParam(value = "row") int row,
+                                                       @RequestParam(value = "groupId", required = false) String groupId) {
         GroupBuyProductDto groupBuyProductDto = new GroupBuyProductDto();
         groupBuyProductDto.setPage(page);
         groupBuyProductDto.setRow(row);
         groupBuyProductDto.setStoreId(storeId);
+        groupBuyProductDto.setGroupId(groupId);
         return getGroupBuyProductBMOImpl.get(groupBuyProductDto);
     }
 

service-goods/src/main/java/com/java110/goods/bmo/groupBuyProduct/impl/GetGroupBuyProductBMOImpl.java

@@ -151,15 +151,15 @@ public class GetGroupBuyProductBMOImpl implements IGetGroupBuyProductBMO {
     }
 
     private void freshProductSpecValue(List<GroupBuyProductDto> productDtos) {
-        ProductSpecValueDto productSpecValueDto = new ProductSpecValueDto();
+        GroupBuyProductSpecDto productSpecValueDto = new GroupBuyProductSpecDto();
         productSpecValueDto.setProductId(productDtos.get(0).getProductId());
         productSpecValueDto.setStoreId(productDtos.get(0).getStoreId());
-        List<ProductSpecValueDto> productSpecValueDtos = productSpecValueInnerServiceSMOImpl.queryProductSpecValues(productSpecValueDto);
+        List<GroupBuyProductSpecDto> productSpecValueDtos = groupBuyProductSpecInnerServiceSMOImpl.queryGroupBuyProductSpecs(productSpecValueDto);
 
         if (productSpecValueDtos == null || productSpecValueDtos.size() < 1) {
             return;
         }
-        productDtos.get(0).setProductSpecValues(productSpecValueDtos);
+        productDtos.get(0).setGroupBuyProductSpecs(productSpecValueDtos);
 
         List<String> specIds = new ArrayList<>();
         for (ProductSpecValueDto productSpecValue : productSpecValueDtos) {