记得上下班打卡 | git大法好，push需谨慎

Skip to content

L
liquidnet-bus-v1
Commit fd4a0fd5 authored by 胡佳晨's avatar 胡佳晨
Browse files
Options

暂时提交

parent 81246d8b
Hide whitespace changes
Inline Side-by-side
Showing with 64 additions and 25 deletions
liquidnet-bus-api/liquidnet-service-goblin-api/src/main/java/com/liquidnet/service/goblin/dto/vo/GoblinZhengzaiStoreListVo.java
View file @ fd4a0fd5
......@@ -2,9 +2,11 @@ package com.liquidnet.service.goblin.dto.vo;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@ApiModel
public class GoblinZhengzaiStoreListVo {
@Data
public class GoblinZhengzaiStoreListVo implements Cloneable {
@ApiModelProperty(value = "商铺id")
String storeId;
@ApiModelProperty(value = "商铺名称")
......@@ -13,4 +15,13 @@ public class GoblinZhengzaiStoreListVo {
String spuCount;
@ApiModelProperty(value = "商铺款式数量")
String skuCount;
private static final GoblinZhengzaiStoreListVo obj = new GoblinZhengzaiStoreListVo();
public static GoblinZhengzaiStoreListVo getNew() {
try {
return (GoblinZhengzaiStoreListVo) obj.clone();
} catch (CloneNotSupportedException e) {
return new GoblinZhengzaiStoreListVo();
}
}
}
liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-web/src/main/java/com/liquidnet/client/admin/web/controller/zhengzai/goblin/GoblinSelfZhengzaiController.java
View file @ fd4a0fd5
......@@ -5,6 +5,7 @@ import com.liquidnet.client.admin.common.core.page.TableDataInfo;
import com.liquidnet.client.admin.zhengzai.goblin.service.IGoblinZhengzaiMarketService;
import com.liquidnet.service.base.ResponseDto;
import com.liquidnet.service.goblin.dto.manage.GoblinStoreZhengzaiParam;
import com.liquidnet.service.goblin.dto.vo.GoblinZhengzaiStoreListVo;
import com.liquidnet.service.goblin.dto.vo.GoblinZhengzaiVo;
import com.liquidnet.service.goblin.entity.GoblinSelfMarketing;
import io.swagger.annotations.*;
......@@ -133,20 +134,19 @@ public class GoblinSelfZhengzaiController extends BaseController {
@ApiImplicitParam(type = "form", required = true, dataType = "String", name = "storeId", value = "商铺id", example = "1"),
@ApiImplicitParam(type = "form", required = true, dataType = "Integet", name = "delTag", value = "删除标记[0-添加|1删除]", example = "0"),
})
public TableDataInfo purchasingSkuDel(@RequestParam("marketId") @Valid String marketId,
@RequestParam("storeId") @Valid String storeId,
@RequestParam("delTag") @Valid Integer delTag) {
startPage();
return getDataTable(goblinZhengzaiMarketService.zhengzaiStore(marketId, storeId, delTag).getData());
public TableDataInfo purchasingStore(@RequestParam("marketId") @Valid String marketId,
@RequestParam("storeId") @Valid String storeId,
@RequestParam("delTag") @Valid Integer delTag) {
return null;
}
@DeleteMapping("zhengzai/store/sku")
@GetMapping("zhengzai/store/list")
@ApiOperation("活动详情-正在下单-参加活动店铺列表")
@ApiResponse(code = 200, message = "接口返回对象参数")
@ApiImplicitParams({
@ApiImplicitParam(type = "form", required = true, dataType = "String", name = "marketId", value = "活动id", example = "1"),
})
public ResponseDto<Boolean> purchasingSkuDel(@RequestParam("marketId") @Valid String marketId) {
public ResponseDto<List<GoblinZhengzaiStoreListVo>> purchasingSkuDel(@RequestParam("marketId") @Valid String marketId) {
return goblinZhengzaiMarketService.zhengzaiStoreList(marketId);
}
}
liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-zhengzai/src/main/java/com/liquidnet/client/admin/zhengzai/goblin/service/IGoblinZhengzaiMarketService.java
View file @ fd4a0fd5
......@@ -88,7 +88,7 @@ public interface IGoblinZhengzaiMarketService {
* @param storeId
* @return
*/
ResponseDto<List<GoblinZhengzaiStoreListVo>> zhengzaiStore(String marketId, String storeId, Integer delTag);
ResponseDto<Boolean> zhengzaiStore(String marketId, String storeId, Integer delTag);
/**
* 查看详情(参加活动的商品列表)
......@@ -96,7 +96,7 @@ public interface IGoblinZhengzaiMarketService {
* @param marketId
* @return
*/
ResponseDto<Boolean> zhengzaiStoreList(String marketId);//TODO
ResponseDto<List<GoblinZhengzaiStoreListVo>> zhengzaiStoreList(String marketId);
}
liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-zhengzai/src/main/java/com/liquidnet/client/admin/zhengzai/goblin/service/imp/GoblinZhengzaiMarketServiceImpl.java
View file @ fd4a0fd5
......@@ -9,16 +9,20 @@ import com.liquidnet.commons.lang.util.DateUtil;
import com.liquidnet.commons.lang.util.IDGenerator;
import com.liquidnet.service.base.ResponseDto;
import com.liquidnet.service.goblin.constant.GoblinStatusConst;
import com.liquidnet.service.goblin.dto.GoblinZhengzaiStoreListDto;
import com.liquidnet.service.goblin.dto.vo.GoblinSelfMarketingVo;
import com.liquidnet.service.goblin.dto.vo.GoblinZhengzaiStoreListVo;
import com.liquidnet.service.goblin.dto.vo.GoblinZhengzaiVo;
import com.liquidnet.service.goblin.entity.GoblinMarketingZhengzai;
import com.liquidnet.service.goblin.entity.GoblinSelfMarketing;
import com.liquidnet.service.goblin.mapper.GoblinMarketingZhengzaiMapper;
import com.liquidnet.service.goblin.mapper.GoblinSelfMarketingMapper;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import java.time.LocalDateTime;
import java.util.ArrayList;
import java.util.List;
import static com.liquidnet.commons.lang.util.DateUtil.DTF_YMD_HMS;
......@@ -35,10 +39,12 @@ public class GoblinZhengzaiMarketServiceImpl implements IGoblinZhengzaiMarketSer
GoblinMongoUtils goblinMongoUtils;
@Autowired
GoblinSelfMarketingMapper goblinSelfMarketingMapper;
@Autowired
GoblinMarketingZhengzaiMapper goblinMarketingZhengzaiMapper;
@Override
public ResponseDto<List<GoblinSelfMarketing>> zhengzaiList(int page, String purchaseName, int status, String st, String et, String ct) {
LambdaUpdateWrapper<GoblinSelfMarketing> queryMapper = Wrappers.lambdaUpdate(GoblinSelfMarketing.getNew()).eq(GoblinSelfMarketing::getDelFlag,0);
LambdaUpdateWrapper<GoblinSelfMarketing> queryMapper = Wrappers.lambdaUpdate(GoblinSelfMarketing.getNew()).eq(GoblinSelfMarketing::getDelFlag, 0);
switch (status) {
case 0://未开始
queryMapper.lt(GoblinSelfMarketing::getStartTime, DateUtil.getNowTime());
......@@ -72,7 +78,7 @@ public class GoblinZhengzaiMarketServiceImpl implements IGoblinZhengzaiMarketSer
goblinSelfMarketingMapper.update(selfMarketing, Wrappers.lambdaUpdate(GoblinSelfMarketing.getNew()).eq(GoblinSelfMarketing::getSelfMarketId, marketId));
//mongo
GoblinSelfMarketingVo vo = GoblinSelfMarketingVo.getNew();
BeanUtils.copyProperties(selfMarketing,vo);
BeanUtils.copyProperties(selfMarketing, vo);
goblinMongoUtils.updateSelfMarket(marketId, vo);
//redis
goblinRedisUtils.setSelfMarket(marketId, vo);
......@@ -92,7 +98,7 @@ public class GoblinZhengzaiMarketServiceImpl implements IGoblinZhengzaiMarketSer
goblinSelfMarketingMapper.insert(selfMarketing);
//mongo
GoblinSelfMarketingVo vo = GoblinSelfMarketingVo.getNew();
BeanUtils.copyProperties(selfMarketing,vo);
BeanUtils.copyProperties(selfMarketing, vo);
vo.setStartTime(st);
vo.setEndTime(et);
goblinMongoUtils.insertSelfMarket(vo);
......@@ -113,7 +119,7 @@ public class GoblinZhengzaiMarketServiceImpl implements IGoblinZhengzaiMarketSer
goblinSelfMarketingMapper.update(selfMarketing, Wrappers.lambdaUpdate(GoblinSelfMarketing.getNew()).eq(GoblinSelfMarketing::getSelfMarketId, marketId));
//mongo
GoblinSelfMarketingVo vo = GoblinSelfMarketingVo.getNew();
BeanUtils.copyProperties(selfMarketing,vo);
BeanUtils.copyProperties(selfMarketing, vo);
vo.setStartTime(st);
vo.setEndTime(et);
goblinMongoUtils.updateSelfMarket(marketId, vo);
......@@ -124,7 +130,7 @@ public class GoblinZhengzaiMarketServiceImpl implements IGoblinZhengzaiMarketSer
@Override
public ResponseDto<GoblinZhengzaiVo> zhengzaiDetails(String marketId) {
GoblinSelfMarketing data = goblinSelfMarketingMapper.selectOne(Wrappers.lambdaQuery(GoblinSelfMarketing.getNew()).eq(GoblinSelfMarketing::getSelfMarketId,marketId));
GoblinSelfMarketing data = goblinSelfMarketingMapper.selectOne(Wrappers.lambdaQuery(GoblinSelfMarketing.getNew()).eq(GoblinSelfMarketing::getSelfMarketId, marketId));
GoblinZhengzaiVo vo = GoblinZhengzaiVo.getNew();
vo.setMarketId(data.getSelfMarketId());
vo.setName(data.getName());
......@@ -141,9 +147,17 @@ public class GoblinZhengzaiMarketServiceImpl implements IGoblinZhengzaiMarketSer
}
@Override
public ResponseDto<Boolean> zhengzaiStoreList(String marketId) {
goblinSelfMarketingMapper.getZhengzaiStoreList(marketId);
return null;
public ResponseDto<List<GoblinZhengzaiStoreListVo>> zhengzaiStoreList(String marketId) {
List<GoblinZhengzaiStoreListDto> dtoList = goblinSelfMarketingMapper.getZhengzaiStoreList(marketId);
List<GoblinZhengzaiStoreListVo> voList = new ArrayList<>();
for (GoblinZhengzaiStoreListDto item : dtoList){
GoblinZhengzaiStoreListVo vo = GoblinZhengzaiStoreListVo.getNew();
vo.setStoreId(item.getStoreId());
vo.setStoreName(item.getStoreName());
vo.setSpuCount(item.getSpuCount());
vo.setSkuCount(item.getSkuCount());
}
return ResponseDto.success(voList);
}
@Override
......@@ -152,7 +166,9 @@ public class GoblinZhengzaiMarketServiceImpl implements IGoblinZhengzaiMarketSer
}
@Override
public ResponseDto<List<GoblinZhengzaiStoreListVo>> zhengzaiStore(String marketId, String storeId, Integer delTag) {
public ResponseDto<Boolean> zhengzaiStore(String marketId, String storeId, Integer delTag) {
GoblinMarketingZhengzai entity = GoblinMarketingZhengzai.getNew();
goblinMarketingZhengzaiMapper.insert(entity);
return null;
}
}
liquidnet-bus-do/liquidnet-service-goblin-do/src/main/java/com/liquidnet/service/goblin/dto/GoblinZhengzaiStoreListDto.java
View file @ fd4a0fd5
package com.liquidnet.service.goblin.dto;
import lombok.Data;
@Data
public class GoblinZhengzaiStoreListDto {
String storeId;
String storeName;
......
liquidnet-bus-do/liquidnet-service-goblin-do/src/main/java/com/liquidnet/service/goblin/entity/GoblinMarketingZhengzai.java
View file @ fd4a0fd5
......@@ -18,7 +18,7 @@ import lombok.EqualsAndHashCode;
*/
@Data
@EqualsAndHashCode(callSuper = false)
public class GoblinMarketingZhengzai implements Serializable {
public class GoblinMarketingZhengzai implements Serializable,Cloneable {
private static final long serialVersionUID = 1L;
......@@ -76,5 +76,12 @@ public class GoblinMarketingZhengzai implements Serializable {
private String comment;
private static final GoblinMarketingZhengzai obj = new GoblinMarketingZhengzai();
public static GoblinMarketingZhengzai getNew() {
try {
return (GoblinMarketingZhengzai) obj.clone();
} catch (CloneNotSupportedException e) {
return new GoblinMarketingZhengzai();
}
}
}
liquidnet-bus-do/liquidnet-service-goblin-do/src/main/java/com/liquidnet/service/goblin/mapper/GoblinSelfMarketingMapper.java
View file @ fd4a0fd5
......@@ -16,6 +16,6 @@ import java.util.List;
*/
public interface GoblinSelfMarketingMapper extends BaseMapper<GoblinSelfMarketing> {
public List<GoblinZhengzaiStoreListDto> getZhengzaiStoreList(String marketId);
List<GoblinZhengzaiStoreListDto> getZhengzaiStoreList(String marketId);
}
liquidnet-bus-do/liquidnet-service-goblin-do/src/main/resources/com.liquidnet.service.goblin.mapper/GoblinSelfMarketingMapper.xml
View file @ fd4a0fd5
......@@ -5,11 +5,14 @@
<resultMap id="goblinZhengzaiStoreListDtoResult" type="com.liquidnet.service.goblin.dto.GoblinZhengzaiStoreListDto">
<result column="store_id" property="storeId"/>
<result column="store_name" property="storeName"/>
<result column="order_code" property="spuCount"/>
<result column="title" property="skuCount"/>
<result column="spu_count" property="spuCount"/>
<result column="sku_count" property="skuCount"/>
</resultMap>
<select id="getZhengzaiStoreList" resultMap="goblinZhengzaiStoreListDtoResult">
select gsz.store_id,gsi.store_name,sum(gsz.spu_id) as 'spu_count',sum(sku_id) as 'sku_count'
from goblin_marketing_zhengzai as gsz
inner join goblin_store_info as gsi on gsi.store_id = gsz.store_id
where gsz.self_market_id = #{marketId} group by gsi.store_id
</select>
</mapper>
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment