java110 лет назад: 5
Родитель
Сommit
b30fbb595f

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

@@ -32,6 +32,8 @@ public class GroupBuyProductDto extends ProductDto implements Serializable {
     private Date batchStartTime;
     private Date batchEndTime;
 
+    private GroupBuyProductSpecDto defaultGroupBuyProductSpec;
+
     private List<GroupBuyProductSpecDto> groupBuyProductSpecs;
 
 
@@ -155,4 +157,12 @@ public class GroupBuyProductDto extends ProductDto implements Serializable {
     public void setBatchEndTime(Date batchEndTime) {
         this.batchEndTime = batchEndTime;
     }
+
+    public GroupBuyProductSpecDto getDefaultGroupBuyProductSpec() {
+        return defaultGroupBuyProductSpec;
+    }
+
+    public void setDefaultGroupBuyProductSpec(GroupBuyProductSpecDto defaultGroupBuyProductSpec) {
+        this.defaultGroupBuyProductSpec = defaultGroupBuyProductSpec;
+    }
 }

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

@@ -21,10 +21,14 @@
         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,
-        gbb.batch_start_time batchStartTime,gbb.batch_end_time batchEndTime
+        gbb.batch_start_time batchStartTime,gbb.batch_end_time batchEndTime,
+        psv.cost_price costPrice,psv.ot_price otPrice,psv.price,psv.vip_price vipPrice,gbps.group_price groupPrice,
+        gbps.group_sales groupSales,gbps.group_stock groupStock
         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
         LEFT JOIN group_buy_batch gbb on t.batch_id = gbb.batch_id and gbb.store_id = t.store_id and gbb.status_cd = '0'
+        left join product_spec_value psv on p.product_id = psv.product_id and psv.store_id = p.store_id and psv.is_default = 'T' and psv.status_cd = '0'
+        left join group_buy_product_spec gbps on psv.value_id = gbps.value_id and gbps.store_id = p.store_id and gbps.product_id = p.product_id and gbps.status_cd = '0'
         where 1 =1
         <if test="groupProdName !=null and groupProdName != ''">
             and t.group_prod_name= #{groupProdName}

+ 15 - 2
service-goods/src/main/java/com/java110/goods/smo/impl/GroupBuyProductInnerServiceSMOImpl.java

@@ -4,6 +4,7 @@ package com.java110.goods.smo.impl;
 import com.java110.core.base.smo.BaseServiceSMO;
 import com.java110.dto.PageDto;
 import com.java110.dto.groupBuyProduct.GroupBuyProductDto;
+import com.java110.dto.groupBuyProductSpec.GroupBuyProductSpecDto;
 import com.java110.goods.dao.IGroupBuyProductServiceDao;
 import com.java110.intf.goods.IGroupBuyProductInnerServiceSMO;
 import com.java110.po.groupBuyProduct.GroupBuyProductPo;
@@ -12,7 +13,9 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RestController;
 
+import java.util.ArrayList;
 import java.util.List;
+import java.util.Map;
 
 /**
  * @ClassName FloorInnerServiceSMOImpl
@@ -62,9 +65,19 @@ public class GroupBuyProductInnerServiceSMOImpl extends BaseServiceSMO implement
             groupBuyProductDto.setPage((page - 1) * groupBuyProductDto.getRow());
         }
 
-        List<GroupBuyProductDto> groupBuyProducts = BeanConvertUtil.covertBeanList(groupBuyProductServiceDaoImpl.getGroupBuyProductInfo(BeanConvertUtil.beanCovertMap(groupBuyProductDto)), GroupBuyProductDto.class);
+        List<Map> groupBuyProductMaps =  groupBuyProductServiceDaoImpl.getGroupBuyProductInfo(BeanConvertUtil.beanCovertMap(groupBuyProductDto));
+        List<GroupBuyProductDto> groupBuyProductDtos = new ArrayList<>();
+        GroupBuyProductDto tmpGroupBuyProductDto = null;
+        GroupBuyProductSpecDto groupBuyProductSpecDto = null;
+        for(Map groupBuyProductMap: groupBuyProductMaps){
+            tmpGroupBuyProductDto = BeanConvertUtil.covertBean(groupBuyProductMap,GroupBuyProductDto.class);
+            groupBuyProductSpecDto = BeanConvertUtil.covertBean(groupBuyProductMap,GroupBuyProductSpecDto.class);
+            tmpGroupBuyProductDto.setDefaultGroupBuyProductSpec(groupBuyProductSpecDto);
+            groupBuyProductDtos.add(tmpGroupBuyProductDto);
+        }
+
 
-        return groupBuyProducts;
+        return groupBuyProductDtos;
     }