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

Commit 9a5449c0 authored by GaoHu's avatar GaoHu

混合售新增上架时间字段

parent c4443c8d
......@@ -70,6 +70,8 @@ public class GoblinMixDetailsVo implements Serializable, Cloneable {
private String xlsName;
@ApiModelProperty(position = 26, value = "店铺id")
private String storeId;
@ApiModelProperty(position = 22, value = "上架时间")
private String shelvesTime;
private static final GoblinMixDetailsVo obj = new GoblinMixDetailsVo();
......@@ -111,6 +113,7 @@ public class GoblinMixDetailsVo implements Serializable, Cloneable {
this.setPayType(source.getPayType());
this.setXlsName(source.getXlsName());
this.setStoreId(source.getStoreId());
this.setShelvesTime(source.getShelvesTime());
return this;
}
}
......@@ -53,6 +53,8 @@ public class GoblinMixDetailsParam implements Serializable, Cloneable {
private String xlsName;
@ApiModelProperty(position = 21, value = "店铺id")
private String storeId;
@ApiModelProperty(position = 22, value = "上架时间")
private String shelvesTime;
private static final GoblinMixDetailsParam obj = new GoblinMixDetailsParam();
......
......@@ -22,6 +22,8 @@ public class GoblinMixUpdateParam implements Serializable, Cloneable {
private String whiteUrl;
@ApiModelProperty(position = 20, value = "xls名称")
private String xlsName;
@ApiModelProperty(position = 22, value = "上架时间")
private String shelvesTime;
private static final GoblinMixUpdateParam obj = new GoblinMixUpdateParam();
......
......@@ -195,7 +195,7 @@ public class GoblinMixServiceImpl implements IGoblinMixService {
mixId, uid, vo.getName(), vo.getTimeStart(), vo.getTimeEnd(), 6, vo.getShowPosition(),
vo.getSellName(), vo.getExpressPrice(), vo.getIntro(), vo.getWatchType(), vo.getCoverPic(),
vo.getVideo(), vo.getDetailUrl(), vo.getDetails(), vo.getStock(), vo.getStockLock(),
vo.getIsLock(), vo.getLimit(), vo.getWhiteType(), vo.getWhiteUrl(), vo.getPayType(), vo.getStoreId(), LocalDateTime.now()
vo.getIsLock(), vo.getLimit(), vo.getWhiteType(), vo.getWhiteUrl(), vo.getPayType(), vo.getStoreId(), LocalDateTime.now(),vo.getShelvesTime()
});
//设置redis
redisUtils.setMixDetails(mixId, vo);
......@@ -235,6 +235,7 @@ public class GoblinMixServiceImpl implements IGoblinMixService {
vo.setWhiteType(param.getWhiteType());
vo.setWhiteUrl(param.getWhiteUrl());
vo.setXlsName(param.getXlsName());
vo.setShelvesTime(param.getShelvesTime());
//redis
redisUtils.setMixDetails(param.getMixId(), vo);
redisList(vo.getShowPosition(), vo.getMixId(), vo.getStatus());
......@@ -245,7 +246,7 @@ public class GoblinMixServiceImpl implements IGoblinMixService {
mongoUtils.changeGoblinMixDetailsVo(vo);
//sql入库
queueUtils.sendMsgByRedis(MQConst.GoblinQueue.GOBLIN_STORE_MARKET.getKey(),
SqlMapping.get("goblin_mix_update", vo.getShowPosition(), vo.getLimit(), vo.getWhiteType(), vo.getWhiteUrl(), LocalDateTime.now(), param.getMixId()));
SqlMapping.get("goblin_mix_update", vo.getShowPosition(), vo.getLimit(), vo.getWhiteType(), vo.getWhiteUrl(), LocalDateTime.now(), vo.getShelvesTime(), param.getMixId()));
return ResponseDto.success();
}
......
......@@ -149,8 +149,8 @@ goblin_list_insert=INSERT INTO goblin_list (`list_id`,`uid`,`name`,`white_type`,
goblin_list_detail_insert=INSERT INTO goblin_list_details (`list_id`,`spu_id`,`sku_id`,`created_at`,`sku_stock`,`price_v`,`product_id`,`price`) VALUES (?,?,?,?,?,?,?,?)
goblin_list_update=UPDATE goblin_list SET white_url = ? ,white_type = ? , black_url = ? , updated_at = ? WHERE list_id = ?
goblin_list_remove=UPDATE goblin_list set del_tag = 1 , updated_at = ? WHERE list_id = ?
#---- 混合售卖 ----
goblin_mix_insert=INSERT INTO goblin_mix (`mix_id`,`uid`,`name`,`time_start`,`time_end`,`status`,`show_position`,`sell_name`,`express_price`,`intro`,`watch_type`,`cover_pic`,`video`,`detail_url`,`details`,`stock`,`stock_lock`,`is_lock`,`limit`,`white_type`,`white_url`,`pay_type`,`store_id`,`created_at`) VALUES (?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?)
#---- \u6DF7\u5408\u552E\u5356 ----
goblin_mix_insert=INSERT INTO goblin_mix (`mix_id`,`uid`,`name`,`time_start`,`time_end`,`status`,`show_position`,`sell_name`,`express_price`,`intro`,`watch_type`,`cover_pic`,`video`,`detail_url`,`details`,`stock`,`stock_lock`,`is_lock`,`limit`,`white_type`,`white_url`,`pay_type`,`store_id`,`created_at`,) VALUES (?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?)
goblin_mix_details_insert=INSERT INTO goblin_mix_details (`mix_id`,`position`,`spu_id`,`sku_id`,`price`,`price_v`,`product_id`,`count`,`created_at`) VALUES (?,?,?,?,?,?,?,?,?)
goblin_mix_status_update=UPDATE goblin_mix SET status = ? , updated_at = ? WHERE mix_id = ?
goblin_mix_update=UPDATE goblin_mix SET show_position = ? , `limit`=?,white_type=?,white_url=? , updated_at = ? WHERE mix_id = ?
\ No newline at end of file
goblin_mix_update=UPDATE goblin_mix SET show_position = ? , `limit`=?,white_type=?,white_url=? , updated_at = ?,shelves_time = ? WHERE mix_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