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

Skip to content

L
liquidnet-bus-v1
Commit 7c6b08a0 authored by 张国柄's avatar 张国柄
Browse files
Options

Merge remote-tracking branch 'origin/dev_goblin' into dev_goblin

parents 69bc5a3a df44b39f
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 262 additions and 81 deletions
liquidnet-bus-api/liquidnet-service-goblin-api/src/main/java/com/liquidnet/service/goblin/constant/GoblinStatusConst.java
View file @ 7c6b08a0
......@@ -33,8 +33,8 @@ public class GoblinStatusConst {
ORDER_STATUS_5(5, "取消订单(用户未付款前取消订单)"),
ORDER_STATUS_6(6, "退款通过(用户已经付款但是商城还未发货，用户发出退款申请，商城同意退款)"),
ORDER_STATUS_7(7, "退货通过(用户已经确认收货后用户发出退货申请，商城同意所有退货申请 ，一个订单可能有多个单品)"),
ORDER_STATUS_61(61, "发起-退款通过(用户已经付款但是商城还未发货，用户发出退款申请，商城同意退款)"),
ORDER_STATUS_71(71, "发起-退货通过(用户已经确认收货后用户发出退货申请，商城同意所有退货申请 ，一个订单可能有多个单品)"),
ORDER_STATUS_61(61, "发起-退款(用户已经付款但是商城还未发货，用户发出退款申请，商城同意退款)"),
ORDER_STATUS_71(71, "发起-退货(用户已经确认收货后用户发出退货申请，商城同意所有退货申请 ，一个订单可能有多个单品)"),
ORDER_LOG_STATUS_11(11, "确认付款"),
ORDER_LOG_STATUS_12(12, "修改金额"),
......
liquidnet-bus-api/liquidnet-service-goblin-api/src/main/java/com/liquidnet/service/goblin/dto/vo/GoblinAppOrderDetailsVo.java
View file @ 7c6b08a0
......@@ -25,6 +25,11 @@ public class GoblinAppOrderDetailsVo implements Serializable, Cloneable {
private GoblinStoreOrderVo storeOrderVo;
@ApiModelProperty(value = " orderSkuVo")
List<GoblinOrderSkuVo> orderSkuVos;
@ApiModelProperty(value = "过期倒计时")
private Long restTime;
@ApiModelProperty(value = "是否可退款")
private int canRefund;
private static final GoblinAppOrderDetailsVo obj = new GoblinAppOrderDetailsVo();
public static GoblinAppOrderDetailsVo getNew() {
try {
......
liquidnet-bus-api/liquidnet-service-goblin-api/src/main/java/com/liquidnet/service/goblin/dto/vo/GoblinAppOrderListVo.java
View file @ 7c6b08a0
......@@ -31,6 +31,12 @@ public class GoblinAppOrderListVo implements Serializable, Cloneable {
private String storeName;
@ApiModelProperty(value = " 订单状态[0-待付款(用户刚下单)|2-代发货(用户付完款 等待商城发货)3-代收货(商城已经发货 等待用户确认收货)|4-已完成(用户已经确认收货 订单结束)|5-取消订单(用户未付款前取消订单)|6-退款通过(用户已经付款但是商城还未发货，用户发出退款申请，商城同意退款)|7-退货通过(用户已经确认收货后用户发出退货申请，商城同意所有退货申请 ，一个订单可能有多个单品)]")
private Integer status;
@ApiModelProperty(value = "过期倒计时", example = "")
private Long restTime;
@ApiModelProperty(value = "活动id")
private String marketId;
@ApiModelProperty(value = "活动类型[ZZ-正在下单]")
private String marketType;
@ApiModelProperty(value = " sku")
List<GoblinOrderSkuVo> orderSkuVos;
private static final GoblinAppOrderListVo obj = new GoblinAppOrderListVo();
......
liquidnet-bus-api/liquidnet-service-goblin-api/src/main/java/com/liquidnet/service/goblin/dto/vo/GoblinFrontBannerVo.java
View file @ 7c6b08a0
......@@ -104,7 +104,8 @@ public class GoblinFrontBannerVo implements Serializable {
*/
@ApiModelProperty(value = "0未删除1已删除")
private Integer delTag;
@ApiModelProperty(value = "ticketId")
private String ticketId;
private static final GoblinFrontBannerVo obj = new GoblinFrontBannerVo();
public static GoblinFrontBannerVo getNew() {
......
liquidnet-bus-api/liquidnet-service-goblin-api/src/main/java/com/liquidnet/service/goblin/dto/vo/GoblinGoodsInfoVo.java
View file @ 7c6b08a0
......@@ -115,6 +115,8 @@ public class GoblinGoodsInfoVo implements Serializable, Cloneable {
private String marketId;
@ApiModelProperty(position = 61, value = "销量")
private Integer count;
@ApiModelProperty(position = 62, value = "商铺名称")
private String storeName;
private static final GoblinGoodsInfoVo obj = new GoblinGoodsInfoVo();
......
liquidnet-bus-api/liquidnet-service-goblin-api/src/main/java/com/liquidnet/service/goblin/dto/vo/GoblinShoppingCartVo.java
View file @ 7c6b08a0
......@@ -25,6 +25,8 @@ public class GoblinShoppingCartVo implements Serializable {
*/
@ApiModelProperty(value = "官方营销表id")
private String storeId;
@ApiModelProperty(value = "商铺名称")
private String storeName;
private static final GoblinShoppingCartVo obj = new GoblinShoppingCartVo();
public static GoblinShoppingCartVo getNew() {
......
liquidnet-bus-api/liquidnet-service-goblin-api/src/main/java/com/liquidnet/service/goblin/dto/vo/GoblinShoppingCartVoo.java
View file @ 7c6b08a0
......@@ -24,6 +24,7 @@ public class GoblinShoppingCartVoo implements Serializable {
private String goblinShoppingCartId;
//mongodb userid
private String userId;
private Integer type;
private int shoopingCount;
......
liquidnet-bus-api/liquidnet-service-goblin-api/src/main/java/com/liquidnet/service/goblin/dto/vo/GoblinStoreOrderVo.java
View file @ 7c6b08a0
......@@ -98,6 +98,10 @@ public class GoblinStoreOrderVo implements Serializable, Cloneable {
private String paymentId;
@ApiModelProperty(value = " paymentType")
private String paymentType;
@ApiModelProperty(value = " 活动类型[ZZ-正在下单]")
private String marketType;
@ApiModelProperty(value = " 活动id")
private String marketId;
@ApiModelProperty(value = " 创建时间")
private String createdAt;
......
liquidnet-bus-do/liquidnet-service-goblin-do/src/main/java/com/liquidnet/service/goblin/entity/GoblinStoreOrder.java
View file @ 7c6b08a0
......@@ -296,6 +296,16 @@ public class GoblinStoreOrder implements Serializable,Cloneable {
*/
private String logisticsCode;
/**
* 活动类型
*/
private String marketType;
/**
* 活动id
*/
private String marketId;
private LocalDateTime createdAt;
private LocalDateTime updatedAt;
......
liquidnet-bus-service/liquidnet-service-goblin/liquidnet-service-goblin-impl/src/main/java/com/liquidnet/service/goblin/controller/GoblinFrontLoginController.java
View file @ 7c6b08a0
......@@ -29,15 +29,15 @@ public class GoblinFrontLoginController {
@GetMapping("addShopCart")
@ApiOperation("加入购物车")
public ResponseDto addShopCart(@RequestParam(name = "spuId", required = true) String spuId,@RequestParam(name = "storeId", required = true) String storeId,@RequestParam(name = "skuId", required = true) String skuId,@RequestParam(name = "number", required = false) Integer number) {
public ResponseDto addShopCart(@RequestParam(name = "spuId", required = true) String spuId,@RequestParam(name = "storeId", required = true) String storeId,@RequestParam(name = "skuId", required = true) String skuId,@RequestParam(name = "number", required = false) Integer number,@RequestParam(name = "type", required = false) Integer type) {
String userId=CurrentUtil.getCurrentUid();
return ResponseDto.success( goblinFrontService.addShoopCart(spuId,storeId,skuId,number,userId));
return ResponseDto.success( goblinFrontService.addShoopCart(spuId,storeId,skuId,number,userId,type));
}
@GetMapping("updateShopCart")
@ApiOperation("修改购物车")
public ResponseDto updateShopCart(@RequestParam(name = "spuId", required = true) String spuId,@RequestParam(name = "storeId", required = true) String storeId,@RequestParam(name = "skuId", required = true) String skuId,@RequestParam(name = "number", required = false) Integer number) {
public ResponseDto updateShopCart(@RequestParam(name = "spuId", required = true) String spuId,@RequestParam(name = "storeId", required = true) String storeId,@RequestParam(name = "skuId", required = true) String skuId,@RequestParam(name = "number", required = false) Integer number,@RequestParam(name = "type", required = false) Integer type) {
String userId=CurrentUtil.getCurrentUid();
return ResponseDto.success( goblinFrontService.updateShopCart(spuId,storeId,skuId,number,userId));
return ResponseDto.success( goblinFrontService.updateShopCart(spuId,storeId,skuId,number,userId,type));
}
......@@ -49,21 +49,21 @@ public class GoblinFrontLoginController {
}
@PostMapping("deleteShopCart")
@ApiOperation("删除购物车")
public ResponseDto deleteShopCart(String skuIds) {
public ResponseDto deleteShopCart(@RequestParam(name = "skuIds", required = false) String skuIds,@RequestParam(name = "type", required = false) Integer type) {
String userId=CurrentUtil.getCurrentUid();
return ResponseDto.success(goblinFrontService.delteShoppingCart(skuIds.split(","),userId));
return ResponseDto.success(goblinFrontService.delteShoppingCart(skuIds.split(","),userId,type));
}
@PostMapping("saveData")
@ApiOperation("保存数据购物车过度")
public ResponseDto saveData(String data) {
public ResponseDto saveData(@RequestParam(name = "data", required = false)String data,@RequestParam(name = "type", required = false)Integer type) {
String userId=CurrentUtil.getCurrentUid();
return ResponseDto.success(goblinFrontService.saveDate(data,userId));
return ResponseDto.success(goblinFrontService.saveDate(data,userId,type));
}
@PostMapping("getData")
@ApiOperation("获得购物车过度")
public ResponseDto getData() {
public ResponseDto getData(@RequestParam(name = "type", required = false)Integer type) {
String userId=CurrentUtil.getCurrentUid();
return ResponseDto.success(goblinFrontService.getDate(userId));
return ResponseDto.success(goblinFrontService.getDate(userId,type));
}
......
liquidnet-bus-service/liquidnet-service-goblin/liquidnet-service-goblin-impl/src/main/java/com/liquidnet/service/goblin/service/impl/GoblinFrontServiceImpl.java
View file @ 7c6b08a0
......@@ -352,7 +352,36 @@ public class GoblinFrontServiceImpl implements GoblinFrontService {
}
public List<GoblinGoodsInfoVo> searchGoodesName(String name){
return null;
Pattern pattern = Pattern.compile("^.*"+name+".*$", Pattern.CASE_INSENSITIVE);
Query query = new Query();
query.addCriteria(Criteria.where("name").regex(pattern));
query.with(Sort.by(
Sort.Order.desc("count"),
Sort.Order.desc("createdAt")
));
List<GoblinGoodsInfoVo> list = mongoTemplate.find(query, GoblinGoodsInfoVo.class, GoblinGoodsInfoVo.class.getSimpleName());
ArrayList<GoblinGoodsInfoVo> list1=ObjectUtil.goblinGoodsInfoVoArrayList();
//遍历
for(GoblinGoodsInfoVo goblinGoodsInfoVo:list){
if(null!=goblinGoodsInfoVo.getExtagVoList()&&goblinGoodsInfoVo.getExtagVoList().size()>0){
GoblinStoreInfoVo goblinStoreInfoVo=goblinRedisUtils.getStoreInfoVo(goblinGoodsInfoVo.getStoreId());
if(null!=goblinStoreInfoVo){
goblinGoodsInfoVo.setStoreName(goblinStoreInfoVo.getStoreName());
}
list1.add(goblinGoodsInfoVo);
}
}
for(GoblinGoodsInfoVo goblinGoodsInfoVo:list){
if(null!=goblinGoodsInfoVo.getExtagVoList()&&goblinGoodsInfoVo.getExtagVoList().size()>0){
}else{
GoblinStoreInfoVo goblinStoreInfoVo=goblinRedisUtils.getStoreInfoVo(goblinGoodsInfoVo.getStoreId());
if(null!=goblinStoreInfoVo){
goblinGoodsInfoVo.setStoreName(goblinStoreInfoVo.getStoreName());
}
list1.add(goblinGoodsInfoVo);
}
}
return list1;
}
public List<GoblinGoodsInfoVo> getStoreGoodes(String storeId,String categoryId,String name){
//
......@@ -577,7 +606,7 @@ public class GoblinFrontServiceImpl implements GoblinFrontService {
* @Description:添加购物车
* @date 2022/1/11 下午4:16
*/
public boolean addShoopCart(String spuId, String storeId,String skuId,Integer number,String userId){
public boolean addShoopCart(String spuId, String storeId,String skuId,Integer number,String userId,Integer type){
if(null==number||number<=0){
return false;
}
......@@ -601,8 +630,8 @@ public class GoblinFrontServiceImpl implements GoblinFrontService {
list.add(goblinShoppingCartVo);
goblinShoppingCartVoo1.setShopList(list);
goblinShoppingCartVoo1.setGoblinShoppingCartId(IDGenerator.nextSnowId());
saveRedisMongodbMysqlShop(goblinShoppingCartVoo1,userId);
insertShopCartMysql(goblinShoppingCartVoDetail.getCarId(),spuId,storeId,skuId,1,userId);
saveRedisMongodbMysqlShop(goblinShoppingCartVoo1,userId,type);
insertShopCartMysql(goblinShoppingCartVoDetail.getCarId(),spuId,storeId,skuId,1,userId,type);
}else{
//查看是否有该商铺
List<GoblinShoppingCartVo> list=goblinShoppingCartVoo.getShopList();
......@@ -643,11 +672,11 @@ public class GoblinFrontServiceImpl implements GoblinFrontService {
goblinShoppingCartVo.setSkuList(list1);
list.add(goblinShoppingCartVo);
}
saveRedisMongodbMysqlShop(goblinShoppingCartVoo,userId);
saveRedisMongodbMysqlShop(goblinShoppingCartVoo,userId,type);
if(isGoods){
updateShopCartMysql(cardId,number,userId);
}else{
insertShopCartMysql(cardId,spuId,storeId,skuId,number,userId);
insertShopCartMysql(cardId,spuId,storeId,skuId,number,userId,type);
}
}
return true;
......@@ -657,7 +686,7 @@ public class GoblinFrontServiceImpl implements GoblinFrontService {
* @Description: 修改 购物车里 数量
* @date 2022/1/11 下午6:24
*/
public boolean updateShopCart(String spuId, String storeId,String skuId,Integer number,String userId){
public boolean updateShopCart(String spuId, String storeId,String skuId,Integer number,String userId,Integer type){
if(null==number||number<=0){
return false;
}
......@@ -679,7 +708,7 @@ public class GoblinFrontServiceImpl implements GoblinFrontService {
}
}
//调用储存方法
saveRedisMongodbMysqlShop(goblinShoppingCartVoo,userId);
saveRedisMongodbMysqlShop(goblinShoppingCartVoo,userId,type);
updateShopCartMysql(cardId,number,userId);
}
return true;
......@@ -705,20 +734,20 @@ public class GoblinFrontServiceImpl implements GoblinFrontService {
* @Description:存储信息
* @date 2022/1/17 下午4:55
*/
public boolean saveDate(String data,String userId) {
redisUtil.set(GoblinRedisConst.FRONT_SHOPCART_TWO.concat(userId),data,60*60*24);
public boolean saveDate(String data,String userId,Integer type) {
redisUtil.set(GoblinRedisConst.FRONT_SHOPCART_TWO.concat(userId).concat(type.toString()),data,60*60*24);
return true;
}
public String getDate(String userId) {
if(redisUtil.get(GoblinRedisConst.FRONT_SHOPCART_TWO.concat(userId))==null){
public String getDate(String userId,Integer type) {
if(redisUtil.get(GoblinRedisConst.FRONT_SHOPCART_TWO.concat(userId).concat(type.toString()))==null){
return "";
}
return (String) redisUtil.get(GoblinRedisConst.FRONT_SHOPCART_TWO.concat(userId));
return (String) redisUtil.get(GoblinRedisConst.FRONT_SHOPCART_TWO.concat(userId).concat(type.toString()));
}
/**
* 删除购物车里面的商品
*/
public boolean delteShoppingCart(String[] skuIds,String userId) {
public boolean delteShoppingCart(String[] skuIds,String userId,Integer type) {
boolean isDeleteAll = false;
GoblinShoppingCartVoo goblinShoppingCartVoo = (GoblinShoppingCartVoo) redisUtil.get(GoblinRedisConst.FRONT_SHOPCART.concat(userId));
if (null != goblinShoppingCartVoo) {
......@@ -746,7 +775,7 @@ public class GoblinFrontServiceImpl implements GoblinFrontService {
deleteRedisMongodbMysqlShop(goblinShoppingCartVoo,userId,skuIds);
deleteMysql(userId,skuIds);
}else{
saveRedisMongodbMysqlShop(goblinShoppingCartVoo,userId);
saveRedisMongodbMysqlShop(goblinShoppingCartVoo,userId,type);
deleteMysql(userId,skuIds);
}
}
......@@ -773,6 +802,7 @@ public class GoblinFrontServiceImpl implements GoblinFrontService {
}
//遍历里面信息
for(GoblinShoppingCartVo goblinShoppingCartVo:goblinShoppingCartVoo.getShopList()){
goblinShoppingCartVo.setStoreName(goblinRedisUtils.getStoreInfoVo(goblinShoppingCartVo.getStoreId()).getStoreName());
for(GoblinShoppingCartVoDetail goblinShoppingCartVoDetail:goblinShoppingCartVo.getSkuList()){
//找到对应的 spu 和 sku
GoblinGoodsInfoVo goblinGoodsInfoVo=goblinRedisUtils.getGoodsInfoVo(goblinShoppingCartVoDetail.getSpuId());
......@@ -797,12 +827,13 @@ public class GoblinFrontServiceImpl implements GoblinFrontService {
goblinShoppingCartVoDetail.setUpdatedAt(LocalDateTime.now());
return goblinShoppingCartVoDetail;
}
public void saveRedisMongodbMysqlShop(GoblinShoppingCartVoo goblinShoppingCartVoo,String userId){
public void saveRedisMongodbMysqlShop(GoblinShoppingCartVoo goblinShoppingCartVoo,String userId,Integer type){
goblinShoppingCartVoo.setUserId(userId);
//redis存储
redisUtil.set(GoblinRedisConst.FRONT_SHOPCART.concat(userId),goblinShoppingCartVoo);
redisUtil.set(GoblinRedisConst.FRONT_SHOPCART.concat(userId).concat(type.toString()),goblinShoppingCartVoo);
//mongodb存储
boolean exists2 =mongoTemplate.exists(Query.query(Criteria.where("goblinShoppingCartId").is(goblinShoppingCartVoo.getGoblinShoppingCartId())),GoblinShoppingCartVoo.class, GoblinShoppingCartVoo.class.getSimpleName());
goblinShoppingCartVoo.setType(type);
if(exists2){
BasicDBObject orderObject = new BasicDBObject("$set", JSON.parse(JsonUtils.toJson(goblinShoppingCartVoo)));
mongoTemplate.getCollection(GoblinShoppingCartVoo.class.getSimpleName()).updateOne(
......@@ -834,13 +865,13 @@ public class GoblinFrontServiceImpl implements GoblinFrontService {
queueUtils.sendMsgByRedis(MQConst.GoblinQueue.GOBLIN_SHOP_CART.getKey(), sqlDatas);
log.info("发送购物车消息队列完毕");
}
public void insertShopCartMysql(String carId ,String spuId, String storeId,String skuId,Integer number,String userId){
public void insertShopCartMysql(String carId ,String spuId, String storeId,String skuId,Integer number,String userId,Integer type){
LinkedList<String> sqls = CollectionUtil.linkedListString();
sqls.add(SqlMapping.get("goblin_shop.cart.insert"));
LinkedList<Object[]> sqlData = CollectionUtil.linkedListObjectArr();
sqlData.add(new Object[]{
//car_id, user_id, store_id,spu_id, sku_id, `number`,marketing_id, del_tag, `comment`
carId,userId,storeId,spuId,skuId,1,"",0,""
carId,userId,storeId,spuId,skuId,1,"",0,"",type
});
String sqlDatas = SqlMapping.gets(sqls, sqlData);
queueUtils.sendMsgByRedis(MQConst.GoblinQueue.GOBLIN_SHOP_CART.getKey(), sqlDatas);
......
liquidnet-bus-service/liquidnet-service-goblin/liquidnet-service-goblin-impl/src/main/java/com/liquidnet/service/goblin/service/impl/GoblinOrderServiceImpl.java
View file @ 7c6b08a0
......@@ -196,10 +196,14 @@ public class GoblinOrderServiceImpl implements IGoblinOrderService {
BigDecimal voucherMarket = BigDecimal.ZERO;//活动优惠金额
String writeOffCode = ""; //取货码
List<GoblinOrderSku> goblinOrderSkuList = ObjectUtil.getGoblinOrderSkuArrayList();
String marketId = "";
String marketType = "";
for (GoblinOrderSkuParam skuParam : storeParam.getGoblinOrderSkuParamArrayList()) {
String pre = GoblinStatusConst.MarketPreStatus.getPre(skuParam.getSkuId());
GoblinGoodsSkuInfoVo skuVo = redisUtils.getGoodsSkuInfoVo(skuParam.getSkuId());
GoblinGoodsInfoVo spuVo = redisUtils.getGoodsInfoVo(skuParam.getSpuId());
marketId = spuVo.getMarketId();
marketType = pre;
skuName = skuName.concat(skuVo.getName()).concat(",");
if (pre != null && pre.contains(GoblinStatusConst.MarketPreStatus.MARKET_PRE_PURCHASE.getValue())) {
writeOffCode = "EMPTY";
......@@ -286,6 +290,9 @@ public class GoblinOrderServiceImpl implements IGoblinOrderService {
storeOrder.setPayCountdownMinute(5);
storeOrder.setIpAddress(CurrentUtil.getCliIpAddr());
storeOrder.setCreatedAt(now);
storeOrder.setMarketId(marketId);
storeOrder.setMarketType(marketType);
//订单attr
GoblinOrderAttr orderAttr = GoblinOrderAttr.getNew();
orderAttr.setOrderAttrId(IDGenerator.nextTimeId2());
......@@ -391,7 +398,7 @@ public class GoblinOrderServiceImpl implements IGoblinOrderService {
sqlDataOrder.add(new Object[]{
storeOrder.getMasterOrderCode(), storeOrder.getOrderId(), storeOrder.getStoreId(), storeOrder.getStoreName(), storeOrder.getOrderCode(), storeOrder.getUserId(), storeOrder.getUserName(), storeOrder.getUserMobile(), storeOrder.getPriceTotal(),
storeOrder.getPriceActual(), storeOrder.getPriceRefund(), storeOrder.getPriceExpress(), storeOrder.getPriceCoupon(), storeOrder.getPriceVoucher(), storeOrder.getStatus(), storeOrder.getUcouponId(), storeOrder.getPayType(), storeOrder.getDeviceFrom(),
storeOrder.getSource(), storeOrder.getVersion(), storeOrder.getIsMember(), storeOrder.getOrderType(), storeOrder.getWriteOffCode(), storeOrder.getPayCountdownMinute(), storeOrder.getIpAddress(), storeOrder.getPayCode(), storeOrder.getCreatedAt()
storeOrder.getSource(), storeOrder.getVersion(), storeOrder.getIsMember(), storeOrder.getOrderType(), storeOrder.getWriteOffCode(), storeOrder.getPayCountdownMinute(), storeOrder.getIpAddress(), storeOrder.getPayCode(), storeOrder.getMarketId(),storeOrder.getMarketType(),storeOrder.getCreatedAt()
});
GoblinOrderAttr orderAttr = item.getOrderAttr();
sqlDataAttr.add(new Object[]{
......
liquidnet-bus-service/liquidnet-service-goblin/liquidnet-service-goblin-impl/src/main/java/com/liquidnet/service/goblin/service/impl/manage/GoblinStoreBackOrderServiceImpl.java
View file @ 7c6b08a0
......@@ -7,12 +7,8 @@ import com.liquidnet.service.base.SqlMapping;
import com.liquidnet.service.base.constant.MQConst;
import com.liquidnet.service.goblin.constant.GoblinStatusConst;
import com.liquidnet.service.goblin.dto.vo.*;
import com.liquidnet.service.goblin.entity.GoblinBackOrder;
import com.liquidnet.service.goblin.entity.GoblinBackOrderLog;
import com.liquidnet.service.goblin.entity.GoblinOrderOperationLog;
import com.liquidnet.service.goblin.param.RefundCallbackParam;
import com.liquidnet.service.goblin.service.manage.IGoblinStoreBackOrderService;
import com.liquidnet.service.goblin.service.manage.IGoblinStoreOrderService;
import com.liquidnet.service.goblin.util.GoblinMongoUtils;
import com.liquidnet.service.goblin.util.GoblinRedisUtils;
import com.liquidnet.service.goblin.util.ObjectUtil;
......@@ -27,7 +23,6 @@ import org.springframework.util.MultiValueMap;
import java.math.BigDecimal;
import java.time.LocalDateTime;
import java.util.HashMap;
import java.util.LinkedList;
import java.util.List;
@Service
......@@ -212,7 +207,7 @@ public class GoblinStoreBackOrderServiceImpl implements IGoblinStoreBackOrderSer
//mysql
queueUtils.sendMsgByRedis(
MQConst.GoblinQueue.GOBLIN_STORE_ORDER_OPERA.getKey(),
SqlMapping.get("goblin_order.store.changeStatus",
SqlMapping.get("goblin_order.store.backOrderStatus",
backOrderVo.getStatus(), now,
backOrderId, now, now
)
......
liquidnet-bus-service/liquidnet-service-goblin/liquidnet-service-goblin-impl/src/main/resources/sqlmap.properties
View file @ 7c6b08a0
......@@ -62,7 +62,7 @@ goblin.self.market.insertRelation=INSERT INTO goblin_marketing_zhengzai (`zhengz
goblin.self.market.updateRelation=UPDATE goblin_marketing_zhengzai SET price_marketing=? ,stock_marketing=? , buy_factor=?,buy_roster=?,buy_limit=?,updated_at=? WHERE self_market_id =? and store_id =?
goblin.self.market.delSpuRelation=UPDATE goblin_marketing_zhengzai SET del_flag = ?,updated_at = ? WHERE self_market_id =? and store_id =? and spu_id=?
#---- 订单创建&支付
goblin.order.create.order_insert=INSERT INTO goblin_store_order (`master_order_code`,`order_id`,`store_id`,`store_name`,`order_code`,`user_id`,`user_name`,`user_mobile`,`price_total`,`price_actual`,`price_refund`,`price_express`,`price_coupon`,`price_voucher`,`status`,`ucoupon_id`,`pay_type`,`device_from`,`source`,`version`,`is_member`,`order_type`,`write_off_code`,`pay_countdown_minute`,`ip_address`,`pay_code`,`created_at`) VALUES (?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?)
goblin.order.create.order_insert=INSERT INTO goblin_store_order (`master_order_code`,`order_id`,`store_id`,`store_name`,`order_code`,`user_id`,`user_name`,`user_mobile`,`price_total`,`price_actual`,`price_refund`,`price_express`,`price_coupon`,`price_voucher`,`status`,`ucoupon_id`,`pay_type`,`device_from`,`source`,`version`,`is_member`,`order_type`,`write_off_code`,`pay_countdown_minute`,`ip_address`,`pay_code`,`market_id`,`market_type`,`created_at`) VALUES (?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?)
goblin.order.create.attr_insert=INSERT INTO goblin_order_attr (`order_attr_id`,`order_id`,`express_contacts`,`express_address`,`express_address_detail`,`express_phone`,`express_type`,`created_at`) VALUES (?,?,?,?,?,?,?,?)
goblin.order.create.sku_insert=INSERT INTO goblin_order_sku (`order_sku_id`,`order_id`,`spu_id`,`spu_name`,`spu_pic`,`sku_id`,`num`,`sku_price`,`sku_price_actual`,`sku_name`,`sku_no`,`sku_image`,`sku_specs`,`price_voucher`,`created_at`) VALUES (?,?,?,?,?,?,?,?,?,?,?,?,?,?)
goblin_order.pay.order=UPDATE goblin_store_order SET payment_type = ? ,payment_id=?,pay_code = ? ,pay_time = ?,write_off_code = ? ,status = ? ,updated_at = ? WHERE order_id = ? and (updated_at <= ? or created_at = ? or updated_at is null)
......@@ -87,7 +87,9 @@ goblin_order.store.refundSkuPrice=UPDATE goblin_order_sku SET price_refund = ? ,
goblin_order.store.refundBackOrder=UPDATE goblin_back_order SET status = ? , updated_at = ? WHERE back_order_id = ? and (updated_at <= ? or created_at = ? or updated_at is null)
goblin_order.store.changeExpress=UPDATE goblin_back_order SET real_back_price = ? ,back_price_express = ? updated_at = ? WHERE back_order_id = ? and (updated_at <= ? or created_at = ? or updated_at is null)
goblin_order.store.changeSku=UPDATE goblin_back_order SET real_back_price = ? , updated_at = ? WHERE back_order_id = ? and (updated_at <= ? or created_at = ? or updated_at is null)
goblin_order.store.changeStatus=UPDATE goblin_back_order SET status = ? , updated_at = ? WHERE back_order_id = ? and (updated_at <= ? or created_at = ? or updated_at is null)
goblin_order.store.backOrderStatus=UPDATE goblin_back_order SET status = ? , updated_at = ? WHERE back_order_id = ? and (updated_at <= ? or created_at = ? or updated_at is null)
goblin_order.store.orderStatus=UPDATE goblin_store_order SET status = ? , updated_at = ? WHERE order_id = ? and (updated_at <= ? or created_at = ? or updated_at is null)
goblin_order.store.applyRefund=UPDATE goblin_back_order SET status = ? ,reason=?, updated_at = ? WHERE back_order_id = ? and (updated_at <= ? or created_at = ? or updated_at is null)
......@@ -95,5 +97,5 @@ goblin_order.store.applyRefund=UPDATE goblin_back_order SET status = ? ,reason=?
goblin_order.user.applyRefund=INSERT INTO goblin_back_order (`back_order_id`,`back_code`,`order_id`,`order_code`,`store_id`,`user_id`,`sku_id_nums`,`type`,`reason`,`describes`,`real_back_price`,`back_price_express`,`status`,`created_at`) VALUES (?,?,?,?,?,?,?,?,?,?,?,?,?,?)
#---- 购物车操作
goblin_shop.cart.delete = UPDATE goblin_shopping_cart set del_tag=? where user_id=? and sku_id=?
goblin_shop.cart.insert = insert into goblin_shopping_cart (car_id, user_id, store_id,spu_id, sku_id, `number`,marketing_id, del_tag, `comment`) values (?,?,?,?,?,?,?,?,?)
goblin_shop.cart.insert = insert into goblin_shopping_cart (car_id, user_id, store_id,spu_id, sku_id, `number`,marketing_id, del_tag, `comment`,`type`) values (?,?,?,?,?,?,?,?,?,?)
goblin_shop.cart.update = update goblin_shopping_cart set `number` = ? where car_id=? and user_id=? and del_tag=0
\ 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