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

Skip to content

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

提交

parent 1078c1b0
Expand all Show whitespace changes
Inline Side-by-side
Showing with 275 additions and 69 deletions
liquidnet-bus-api/liquidnet-service-goblin-api/src/main/java/com/liquidnet/service/goblin/constant/GoblinRedisConst.java
View file @ 93d37193
......@@ -25,10 +25,12 @@ public class GoblinRedisConst {
/* ----------------------------------------------------------------- */
public static final String REDIS_GOBLIN_SELF_MARKET = PREFIX.concat("self:market:");
public static final String REDIS_GOBLIN_ZHENGZAI_RELATION = PREFIX.concat("zhengzai:market:");
public static final String REDIS_GOBLIN_STORE_SELF_RELATION = PREFIX.concat("zhengzai:storeId:");
public static final String REDIS_GOBLIN_MARKET_RELATION = PREFIX.concat("market:relation:");//商铺活动-商铺款式关联关系
public static final String REDIS_GOBLIN_SELF_MARKET = PREFIX.concat("self:market:");//官方活动
public static final String REDIS_GOBLIN_ZHENGZAI_RELATION = PREFIX.concat("zhengzai:market:");//活动-正在下单-可参加商户
public static final String REDIS_GOBLIN_STORE_SELF_RELATION = PREFIX.concat("zhengzai:storeId:");//活动-当前商铺能参与的官方活动id列表
public static final String REDIS_GOBLIN_STORE_MARKET = PREFIX.concat("store:market:");//商铺活动
public static final String REDIS_GOBLIN_STORE_MARKET = PREFIX.concat("store:market:");
public static final String REDIS_GOBLIN_STORE_MARKET_ISCONFIG = PREFIX.concat("store:is_config:");//商铺活动-该活动配置了款式的商品
/* ----------------------------------------------------------------- */
}
liquidnet-bus-api/liquidnet-service-goblin-api/src/main/java/com/liquidnet/service/goblin/dto/manage/GoblinStorePurchaseCommonParam.java 0 → 100644
View file @ 93d37193
package com.liquidnet.service.goblin.dto.manage;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import javax.validation.constraints.NotBlank;
import java.math.BigDecimal;
import java.util.List;
@ApiModel(value = "GoblinStorePurchaseItemParam")
@Data
public class GoblinStorePurchaseCommonParam {
@ApiModelProperty(required = true, value = "商铺活动Id", example = "1")
@NotBlank(message = "商铺活动Id不能为空")
private String storeMarketId;
@ApiModelProperty(required = true, value = "商铺Id", example = "1")
@NotBlank(message = "商铺id不能为空")
private String storeId;
@ApiModelProperty(required = true, value = "spuId", example = "1")
@NotBlank(message = "spuId不能空")
private String spuId;
@ApiModelProperty(required = true, value = "相关配置", example = "1")
private List<GoblinStorePurchaseItemParam> goblinStorePurchaseItemParam;
}
liquidnet-bus-api/liquidnet-service-goblin-api/src/main/java/com/liquidnet/service/goblin/dto/manage/GoblinStorePurchaseItemParam.java
View file @ 93d37193
......@@ -10,16 +10,6 @@ import java.math.BigDecimal;
@ApiModel(value = "GoblinStorePurchaseItemParam")
@Data
public class GoblinStorePurchaseItemParam {
@ApiModelProperty(required = true, value = "商铺活动Id", example = "1")
@NotBlank(message = "商铺活动Id不能为空")
private String storeMarketId;
@ApiModelProperty(required = true, value = "商铺Id", example = "1")
@NotBlank(message = "商铺id不能为空")
private String storeId;
@ApiModelProperty(required = true, value = "spuId", example = "1")
@NotBlank(message = "spuId不能空")
private String spuId;
@ApiModelProperty(required = true, value = "skuId", example = "1")
@NotBlank(message = "skuId不能为空")
private String skuId;
......@@ -34,5 +24,10 @@ public class GoblinStorePurchaseItemParam {
private Integer buyLimit;
@ApiModelProperty(required = true, value = "购买条件[0-全部用户|1-仅支持会员|2-指定用户可买]", example = "1")
@NotBlank(message = "购买条件不能为空")
private Integer buyType;
private Integer buyFactor;
@ApiModelProperty(required = false, value = "购买限制人员名单[购买限制为2-指定用户时必填]", example = "")
private String buyRoster;
}
liquidnet-bus-api/liquidnet-service-goblin-api/src/main/java/com/liquidnet/service/goblin/dto/vo/GoblinGoodsInfoVo.java
View file @ 93d37193
......@@ -90,6 +90,8 @@ public class GoblinGoodsInfoVo implements Serializable, Cloneable {
private List<GoblinGoodsServiceSupportVo> serviceSupportVoList;
@ApiModelProperty(position = 54, value = "音乐人、艺术家、IP列表")
private List<GoblinGoodsExtagVo> extagVoList;
@ApiModelProperty(position = 55, value = "活动Id")
private String marketId;
private static final GoblinGoodsInfoVo obj = new GoblinGoodsInfoVo();
......
liquidnet-bus-api/liquidnet-service-goblin-api/src/main/java/com/liquidnet/service/goblin/dto/vo/GoblinGoodsSkuInfoVo.java
View file @ 93d37193
......@@ -60,6 +60,8 @@ public class GoblinGoodsSkuInfoVo implements Serializable, Cloneable {
private String skuAppear;
@ApiModelProperty(position = 33, value = "上架时间")
private LocalDateTime shelvesAt;
@ApiModelProperty(position = 34, value = "活动Id")
private String marketId;
private String createdBy;
private LocalDateTime createdAt;
private String updatedBy;
......
liquidnet-bus-api/liquidnet-service-goblin-api/src/main/java/com/liquidnet/service/goblin/dto/vo/GoblinMarketRelationVo.java 0 → 100644
View file @ 93d37193
package com.liquidnet.service.goblin.dto.vo;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.io.Serializable;
import java.util.List;
@ApiModel(value = "GoblinStoreMarketRelationVo", description = "前端用 商铺活动 关联 spu sku")
@Data
public class GoblinMarketRelationVo implements Serializable, Cloneable {
private static final long serialVersionUID = 2353354057235207502L;
@ApiModelProperty(position = 11, value = "spuId")
private String spuId;
@ApiModelProperty(position = 12, value = "skuId 几盒")
private List<String> skuList;
private static final GoblinMarketRelationVo obj = new GoblinMarketRelationVo();
public static GoblinMarketRelationVo getNew() {
try {
return (GoblinMarketRelationVo) obj.clone();
} catch (CloneNotSupportedException e) {
return new GoblinMarketRelationVo();
}
}
}
liquidnet-bus-api/liquidnet-service-goblin-api/src/main/java/com/liquidnet/service/goblin/service/manage/IGoblinStorePurchasingService.java
View file @ 93d37193
......@@ -2,6 +2,7 @@ package com.liquidnet.service.goblin.service.manage;
import com.github.pagehelper.PageInfo;
import com.liquidnet.service.base.ResponseDto;
import com.liquidnet.service.goblin.dto.manage.GoblinStorePurchaseCommonParam;
import com.liquidnet.service.goblin.dto.manage.GoblinStorePurchaseItemParam;
import com.liquidnet.service.goblin.dto.vo.GoblinStoreMarketVo;
......@@ -79,7 +80,7 @@ public interface IGoblinStorePurchasingService {
* @param params
* @return
*/
ResponseDto<Boolean> purchasingSkuInsert(List<GoblinStorePurchaseItemParam> params);
ResponseDto<Boolean> purchasingSkuInsert(GoblinStorePurchaseCommonParam params);
/**
* 编辑活动相关sku
......@@ -87,7 +88,7 @@ public interface IGoblinStorePurchasingService {
* @param params
* @return
*/
ResponseDto<Boolean> purchasingSkuUpdate(List<GoblinStorePurchaseItemParam> params);
ResponseDto<Boolean> purchasingSkuUpdate(GoblinStorePurchaseCommonParam params);
/**
* 删除活动内sku
......@@ -96,5 +97,5 @@ public interface IGoblinStorePurchasingService {
* @param skuId skuId
* @return
*/
ResponseDto<Boolean> purchasingSkuDel(String marketId, String storeId,String spuId, String skuId);
ResponseDto<Boolean> purchasingSkuDel(String marketId, String storeId,String spuId);
}
liquidnet-bus-do/liquidnet-service-goblin-do/src/main/java/com/liquidnet/service/goblin/entity/GoblinMarketingZhengzai.java
View file @ 93d37193
......@@ -61,14 +61,19 @@ public class GoblinMarketingZhengzai implements Serializable,Cloneable {
private Integer stockMarketing;
/**
* 用户限购[0-不限购|x-限购数量]
* 购买限制[0-全部用户|1-仅会员|2-指定用户]
*/
private Integer buyLimit;
private String buyFactor;
/**
* 购买条件[0-全部用户|1-仅支持会员|2-指定用户可买]
* 购买限制人员名单[购买限制为2-指定用户时必填]
*/
private Integer buyType;
private String buyRoster;
/**
* 限量[0-无限制|X:限购数量]
*/
private Integer buyLimit;
private LocalDateTime createdAt;
......
liquidnet-bus-do/liquidnet-service-goblin-do/src/main/java/com/liquidnet/service/goblin/entity/GoblinStoreMarketPurchasing.java
View file @ 93d37193
......@@ -61,14 +61,19 @@ public class GoblinStoreMarketPurchasing implements Serializable,Cloneable {
private Integer stockMarketing;
/**
* 用户限购[0-不限购|x-限购数量]
* 购买限制[0-全部用户|1-仅会员|2-指定用户]
*/
private Integer buyLimit;
private Integer buyFactor;
/**
* 购买条件[0-全部用户|1-仅支持会员|2-指定用户可买]
* 购买限制人员名单[购买限制为2-指定用户时必填]
*/
private Integer buyType;
private String buyRoster;
/**
* 限量[0-无限制|X:限购数量]
*/
private Integer buyLimit;
/**
* 删除标记[0-未删除|1-删除]
......
liquidnet-bus-service/liquidnet-service-goblin/liquidnet-service-goblin-impl/src/main/java/com/liquidnet/service/goblin/controller/manage/GoblinStorePurchasingController.java
View file @ 93d37193
......@@ -2,6 +2,7 @@ package com.liquidnet.service.goblin.controller.manage;
import com.github.pagehelper.PageInfo;
import com.liquidnet.service.base.ResponseDto;
import com.liquidnet.service.goblin.dto.manage.GoblinStorePurchaseCommonParam;
import com.liquidnet.service.goblin.dto.manage.GoblinStorePurchaseItemParam;
import com.liquidnet.service.goblin.dto.manage.GoblinStorePurchaseParam;
import com.liquidnet.service.goblin.dto.vo.GoblinPurchasingVo;
......@@ -107,16 +108,14 @@ public class GoblinStorePurchasingController {
@PostMapping("purchasing/sku")
@ApiOperation("活动详情-限时秒杀-sku新增")
@ApiResponse(code = 200, message = "接口返回对象参数")
@ResponseBody
public ResponseDto<Boolean> purchasingSkuInsert(List<GoblinStorePurchaseItemParam> params) {
public ResponseDto<Boolean> purchasingSkuInsert(@RequestBody GoblinStorePurchaseCommonParam params) {
return goblinStorePurchasingService.purchasingSkuInsert(params);
}
@PutMapping("purchasing/sku")
@ApiOperation("活动详情-限时秒杀-sku修改")
@ApiResponse(code = 200, message = "接口返回对象参数")
@ResponseBody
public ResponseDto<Boolean> purchasingSkuUpdate(List<GoblinStorePurchaseItemParam> params) {
public ResponseDto<Boolean> purchasingSkuUpdate(@RequestBody GoblinStorePurchaseCommonParam params) {
return goblinStorePurchasingService.purchasingSkuUpdate(params);
}
......@@ -126,14 +125,12 @@ public class GoblinStorePurchasingController {
@ApiImplicitParams({
@ApiImplicitParam(type = "form", required = true, dataType = "String", name = "marketId", value = "活动id", example = "1"),
@ApiImplicitParam(type = "form", required = true, dataType = "String", name = "storeId", value = "商铺id", example = "1"),
@ApiImplicitParam(type = "form", required = true, dataType = "String", name = "spuId", value = "spuId", example = "1"),
@ApiImplicitParam(type = "form", required = true, dataType = "String", name = "skuId", value = "skuId", example = "1"),
@ApiImplicitParam(type = "form", required = true, dataType = "String", name = "spuId", value = "spuId", example = "1")
})
public ResponseDto<Boolean> purchasingSkuDel(@RequestParam("marketId") @Valid String marketId,
@RequestParam("storeId") @Valid String storeId,
@RequestParam("spuId") @Valid String spuId,
@RequestParam("skuId") @Valid String skuId) {
return goblinStorePurchasingService.purchasingSkuDel(marketId, storeId, spuId, skuId);
@RequestParam("spuId") @Valid String spuId) {
return goblinStorePurchasingService.purchasingSkuDel(marketId, storeId, spuId);
}
}
liquidnet-bus-service/liquidnet-service-goblin/liquidnet-service-goblin-impl/src/main/java/com/liquidnet/service/goblin/util/GoblinMongoUtils.java
View file @ 93d37193
......@@ -35,6 +35,10 @@ public class GoblinMongoUtils {
return mongoTemplate.insert(vo, GoblinGoodsInfoVo.class.getSimpleName());
}
public void delGoodsInfoVo(String spuId) {
mongoTemplate.remove(Query.query(Criteria.where("spuId").is(spuId)), GoblinGoodsInfoVo.class, GoblinGoodsInfoVo.class.getSimpleName());
}
// SPU信息
public GoblinGoodsInfoVo getGoodsInfoVo(String spuId) {
return mongoTemplate.findOne(Query.query(Criteria.where("spuId").is(spuId).and("shelvesStatus").is("3")),
......@@ -55,6 +59,10 @@ public class GoblinMongoUtils {
return mongoTemplate.insert(vo, GoblinGoodsSkuInfoVo.class.getSimpleName());
}
public void delGoodsSkuInfoVo(String skuId) {
mongoTemplate.remove(Query.query(Criteria.where("skuId").is(skuId)), GoblinGoodsSkuInfoVo.class, GoblinGoodsSkuInfoVo.class.getSimpleName());
}
// SKU信息
public GoblinGoodsSkuInfoVo getGoodsSkuInfoVo(String skuId) {
return mongoTemplate.findOne(Query.query(Criteria.where("skuId").is(skuId).and("shelvesStatus").is("3")),
......
liquidnet-bus-service/liquidnet-service-goblin/liquidnet-service-goblin-impl/src/main/java/com/liquidnet/service/goblin/util/GoblinRedisUtils.java
View file @ 93d37193
package com.liquidnet.service.goblin.util;
import com.liquidnet.common.cache.redis.util.RedisUtil;
import com.liquidnet.commons.lang.util.CollectionUtil;
import com.liquidnet.service.goblin.constant.GoblinRedisConst;
import com.liquidnet.service.goblin.dto.vo.*;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
import java.util.ArrayList;
import java.util.List;
@Component
......@@ -21,6 +23,10 @@ public class GoblinRedisUtils {
return redisUtil.set(GoblinRedisConst.BASIC_GOODS.concat(vo.getSpuId()), vo);
}
public void delGoodsInfoVo(String spuId) {
redisUtil.del(GoblinRedisConst.BASIC_GOODS.concat(spuId));
}
/**
* 商品基础信息
*
......@@ -40,6 +46,10 @@ public class GoblinRedisUtils {
return redisUtil.set(GoblinRedisConst.BASIC_GOODS_SKU.concat(vo.getSkuId()), vo);
}
public void delGoodsSkuInfoVo(String skuId) {
redisUtil.del(GoblinRedisConst.BASIC_GOODS_SKU.concat(skuId));
}
/**
* 单品信息
*
......@@ -102,6 +112,78 @@ public class GoblinRedisUtils {
redisUtil.del(redisKey);
}
public List<String> getStoreMarketIsConfig(String marketId,String storeId){
String redisKey = GoblinRedisConst.REDIS_GOBLIN_STORE_MARKET_ISCONFIG.concat(marketId).concat(":store_id:" + storeId);
Object obj = redisUtil.get(redisKey);
if(obj==null){
return CollectionUtil.arrayListString();
}else{
return (List<String>) obj;
}
}
public void addStoreMarketIsConfig(String marketId,String storeId,String spuId){
String redisKey = GoblinRedisConst.REDIS_GOBLIN_STORE_MARKET_ISCONFIG.concat(marketId).concat(":store_id:" + storeId);
List<String> voList = getStoreMarketIsConfig(marketId,storeId);
voList.add(spuId);
redisUtil.set(redisKey,voList);
}
public void delStoreMarketIsConfig(String marketId,String storeId,String spuId){
String redisKey = GoblinRedisConst.REDIS_GOBLIN_STORE_MARKET_ISCONFIG.concat(marketId).concat(":store_id:" + storeId);
List<String> voList = getStoreMarketIsConfig(marketId,storeId);
voList.remove(spuId);
redisUtil.set(redisKey,voList);
}
/**
* 添加 活动内商品款式关联关系
*
* @param marketPre
* @param marketId
* @param vo
*/
public void addMarketRelation(String marketPre, String marketId, GoblinMarketRelationVo vo) {
String redisKey = GoblinRedisConst.REDIS_GOBLIN_MARKET_RELATION.concat(marketPre).concat(marketId);
List<GoblinMarketRelationVo> voList = getMarketRelation(marketPre, marketId);
voList.add(vo);
redisUtil.set(redisKey, voList);
}
/**
* 移除 活动内商品款式关联关系
*
* @param marketPre
* @param marketId
*/
public void removeMarketRelation(String marketPre, String marketId, String spuId) {
String redisKey = GoblinRedisConst.REDIS_GOBLIN_MARKET_RELATION.concat(marketPre).concat(marketId);
List<GoblinMarketRelationVo> voList = getMarketRelation(marketPre, marketId);
for (GoblinMarketRelationVo item : voList) {
if (item.getSpuId().equals(spuId)) {
voList.remove(item);
break;
}
}
redisUtil.set(redisKey, voList);
}
/**
* 获取 活动内商品款式关联关系
*
* @param marketPre
* @param marketId
*/
public List<GoblinMarketRelationVo> getMarketRelation(String marketPre, String marketId) {
String redisKey = GoblinRedisConst.REDIS_GOBLIN_MARKET_RELATION.concat(marketPre).concat(marketId);
Object obj = redisUtil.get(redisKey);
if (obj == null) {
return new ArrayList();
} else {
return (List<GoblinMarketRelationVo>) obj;
}
}
/**
* 获取 当前商铺能参与的官方活动id列表
*
......
liquidnet-bus-service/liquidnet-service-goblin/liquidnet-service-goblin-impl/src/main/resources/sqlmap.properties
View file @ 93d37193
goblin.store.market.insert=INSERT INTO goblin_store_marketing (`store_market_id`,`name`,`type`,`status`,`store_id`,`start_time`,`end_time`,`del_flag`,`is_pre`,`pre_time`,`created_at`) VALUES (?,?,?,?,?,?,?,?,?,?,?)
goblin.store.market.status=UPDATE goblin_store_marketing SET status=? , del_flag=? WHERE store_market_id =? and store_id =?
goblin.store.market.update=UPDATE goblin_store_marketing SET name=?,type=?,status=?,store_id=?,describes=?,start_time=?,end_time=?,del_flag=?,is_pre=?,pre_time=?,updated_at=? WHERE store_market_id =? and store_id =?
goblin.store.market.insertRelation=INSERT INTO goblin_store_market_purchasing (`purchase_id`,`store_market_id`,`spu_id`,`sku_id`,`store_id`,`price_marketing`,`stock_marketing`,`buy_factor`,`buy_roster`,`buy_limit`,`del_flag`,`created_at`) VALUES (?,?,?,?,?,?,?,?,?,?,?,?)
goblin.store.market.updateRelation=UPDATE goblin_store_market_purchasing SET price_marketing=? ,stock_marketing=? , buy_factor=?,buy_roster=?,buy_limit=?,updated_at=? WHERE store_market_id =? and store_id =?
goblin.store.market.delSpuRelation=UPDATE goblin_store_market_purchasing SET del_flag = ?,updated_at = ? WHERE store_market_id =? and store_id =? and spu_id=?
\ No newline at end of file
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