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

Commit edb3f1ef authored by 张国柄's avatar 张国柄

~api:藏品管理:藏品添加/编辑+ERP属性处理;

parent 7f2a0922
...@@ -65,6 +65,13 @@ public class GoblinStoreMgtDigitalGoodsAddParam implements Serializable { ...@@ -65,6 +65,13 @@ public class GoblinStoreMgtDigitalGoodsAddParam implements Serializable {
@Size(max = 25, message = "发行方内容过长") @Size(max = 25, message = "发行方内容过长")
private String publisher; private String publisher;
@ApiModelProperty(position = 26, required = true, value = "ERP类型[WANGDIAN-旺店通]")
@Pattern(regexp = "\\b(WANGDIAN)\\b", message = "ERP类型无效")
private String erpType;
@ApiModelProperty(position = 26, required = false, value = "ERP商品编码[藏品品对应在ERP的商品编码,默认为空]")
@Size(max = 40, message = "ERP商品编码长度限制40")
private String spuErpCode;
/** /**
* 生成SPU * 生成SPU
* *
...@@ -98,6 +105,8 @@ public class GoblinStoreMgtDigitalGoodsAddParam implements Serializable { ...@@ -98,6 +105,8 @@ public class GoblinStoreMgtDigitalGoodsAddParam implements Serializable {
vo.setSpuAppear("1"); vo.setSpuAppear("1");
vo.setDelFlg("0"); vo.setDelFlg("0");
vo.setSkuIdList(CollectionUtil.linkedListString()); vo.setSkuIdList(CollectionUtil.linkedListString());
vo.setErpType(StringUtils.isBlank(this.getErpType()) ? "WANGDIAN" : this.getErpType());
vo.setSpuErpCode(StringUtils.trim(this.getSpuErpCode()));
return vo; return vo;
} }
...@@ -115,6 +124,8 @@ public class GoblinStoreMgtDigitalGoodsAddParam implements Serializable { ...@@ -115,6 +124,8 @@ public class GoblinStoreMgtDigitalGoodsAddParam implements Serializable {
vo.setCateFid(this.getCateFid()); vo.setCateFid(this.getCateFid());
vo.setCateSid(this.getCateSid()); vo.setCateSid(this.getCateSid());
vo.setCateTid(this.getCateTid()); vo.setCateTid(this.getCateTid());
// vo.setErpType();// 暂不考虑更改ERP类型
vo.setSpuErpCode(StringUtils.trim(this.getSpuErpCode()));
return vo; return vo;
} }
} }
...@@ -113,6 +113,16 @@ public class GoblinStoreMgtDigitalGoodsAddSkuParam implements Serializable { ...@@ -113,6 +113,16 @@ public class GoblinStoreMgtDigitalGoodsAddSkuParam implements Serializable {
@Size(max = 10000, message = "藏品详情内容过长") @Size(max = 10000, message = "藏品详情内容过长")
private String details; private String details;
@ApiModelProperty(position = 30, required = false, value = "ERP规格编码")
@Size(max = 40, message = "ERP规格编码长度限制40")
private String skuErpCode;
@ApiModelProperty(position = 30, value = "ERP托管[0-否|1-是],默认0")
@Pattern(regexp = "\\b(0|1)\\b", message = "ERP托管参数无效")
private String erpHosting;
@ApiModelProperty(position = 30, required = false, value = "ERP仓库编号")
@Size(max = 40, message = "ERP仓库编号长度限制40")
private String erpWarehouseNo;
// @ApiModelProperty(position = 31, required = true, value = "上架处理方式[1-等待手动上架|2-直接上架售卖|3-预约定时上架]", example = "1") // @ApiModelProperty(position = 31, required = true, value = "上架处理方式[1-等待手动上架|2-直接上架售卖|3-预约定时上架]", example = "1")
// @NotNull(message = "上架处理方式不能为空") // @NotNull(message = "上架处理方式不能为空")
// @Pattern(regexp = "\\b(1|2|3)\\b", message = "上架处理方式参数无效") // @Pattern(regexp = "\\b(1|2|3)\\b", message = "上架处理方式参数无效")
...@@ -199,6 +209,11 @@ public class GoblinStoreMgtDigitalGoodsAddSkuParam implements Serializable { ...@@ -199,6 +209,11 @@ public class GoblinStoreMgtDigitalGoodsAddSkuParam implements Serializable {
initVo.setSkuCanbuy(null == this.getSkuCanbuy() ? "1" : this.getSkuCanbuy());//1 initVo.setSkuCanbuy(null == this.getSkuCanbuy() ? "1" : this.getSkuCanbuy());//1
initVo.setOpeningTime(DateUtil.Formatter.yyyyMMddHHmmss.parse(this.getOpeningTime()));//1 initVo.setOpeningTime(DateUtil.Formatter.yyyyMMddHHmmss.parse(this.getOpeningTime()));//1
} }
initVo.setSkuErpCode(StringUtils.trim(this.getSkuErpCode()));
// initVo.setErpType();// 根据SPU设置
initVo.setErpHosting(StringUtils.isEmpty(this.getErpHosting()) ? 0 : Integer.parseInt(this.getErpHosting()));
initVo.setErpWarehouseNo(StringUtils.trim(this.getErpWarehouseNo()));
return initVo; return initVo;
} }
...@@ -240,6 +255,9 @@ public class GoblinStoreMgtDigitalGoodsAddSkuParam implements Serializable { ...@@ -240,6 +255,9 @@ public class GoblinStoreMgtDigitalGoodsAddSkuParam implements Serializable {
updateVo.setOpeningTime(DateUtil.Formatter.yyyyMMddHHmmss.parse(this.getOpeningTime()));//1 updateVo.setOpeningTime(DateUtil.Formatter.yyyyMMddHHmmss.parse(this.getOpeningTime()));//1
break; break;
} }
updateVo.setSkuErpCode(StringUtils.trim(this.getSkuErpCode()));
updateVo.setErpHosting(StringUtils.isEmpty(this.getErpHosting()) ? 0 : Integer.parseInt(this.getErpHosting()));
updateVo.setErpWarehouseNo(StringUtils.trim(this.getErpWarehouseNo()));
return updateVo; return updateVo;
} }
} }
...@@ -641,9 +641,11 @@ public class GoblinStoreMgtGoodsController { ...@@ -641,9 +641,11 @@ public class GoblinStoreMgtGoodsController {
// return ResponseDto.failure(ErrorCode.HTTP_PARAM_ERROR.getCode(), "商品分类3无效"); // return ResponseDto.failure(ErrorCode.HTTP_PARAM_ERROR.getCode(), "商品分类3无效");
// } // }
} }
if (StringUtils.isNotBlank(mgtGoodsInfoVo.getSpuErpCode()) && StringUtils.isBlank(mgtGoodsAddParam.getSpuErpCode())) { if (StringUtils.isNotEmpty(mgtGoodsInfoVo.getSpuErpCode()) && StringUtils.isBlank(mgtGoodsAddParam.getSpuErpCode())) {
if (hasSkuFlg && goodsSkuInfoVos.stream().anyMatch(r -> r.getErpHosting() == 1)) {// 存在SKU启用ERP托管,不可修改`spu_erp_code` if (hasSkuFlg && goodsSkuInfoVos.stream().anyMatch(r -> r.getErpHosting() == 1)) {// 存在SKU启用ERP托管,不可修改`spu_erp_code`
mgtGoodsAddParam.setSpuErpCode(mgtGoodsInfoVo.getSpuErpCode()); mgtGoodsAddParam.setSpuErpCode(mgtGoodsInfoVo.getSpuErpCode());
} else {
mgtGoodsAddParam.setSpuErpCode(mgtGoodsAddParam.getSpuErpCode());
} }
} }
if (log.isDebugEnabled()) { if (log.isDebugEnabled()) {
...@@ -685,6 +687,14 @@ public class GoblinStoreMgtGoodsController { ...@@ -685,6 +687,14 @@ public class GoblinStoreMgtGoodsController {
if (StringUtils.isNotBlank(cateTid) && selfGoodsCategoryVos.stream().noneMatch(r -> r.getCateId().equals(cateTid) && r.getGrade().equals("3"))) { if (StringUtils.isNotBlank(cateTid) && selfGoodsCategoryVos.stream().noneMatch(r -> r.getCateId().equals(cateTid) && r.getGrade().equals("3"))) {
return ResponseDto.failure(ErrorCode.HTTP_PARAM_ERROR.getCode(), "商品三级分类无效"); return ResponseDto.failure(ErrorCode.HTTP_PARAM_ERROR.getCode(), "商品三级分类无效");
} }
if (StringUtils.isNotEmpty(mgtGoodsInfoVo.getSpuErpCode()) && StringUtils.isBlank(mgtDigitalGoodsEditParam.getSpuErpCode())) {
List<String> skuIdList = mgtGoodsInfoVo.getSkuIdList();
if (!CollectionUtils.isEmpty(skuIdList) && skuIdList.stream().anyMatch(r -> goblinRedisUtils.getGoodsSkuInfoVo(r).getErpHosting() == 1)) {// 存在SKU启用ERP托管,不可修改`spu_erp_code`
mgtDigitalGoodsEditParam.setSpuErpCode(mgtGoodsInfoVo.getSpuErpCode());
} else {
mgtDigitalGoodsEditParam.setSpuErpCode(mgtDigitalGoodsEditParam.getSpuErpCode());
}
}
if (log.isDebugEnabled()) { if (log.isDebugEnabled()) {
log.debug("商品管理:商品编辑:SPU编辑:[GoblinStoreMgtGoodsAddParam={}]", JsonUtils.toJson(mgtDigitalGoodsEditParam)); log.debug("商品管理:商品编辑:SPU编辑:[GoblinStoreMgtGoodsAddParam={}]", JsonUtils.toJson(mgtDigitalGoodsEditParam));
} }
...@@ -869,17 +879,10 @@ public class GoblinStoreMgtGoodsController { ...@@ -869,17 +879,10 @@ public class GoblinStoreMgtGoodsController {
mgtGoodsEditSkuParam.setSkuSpecList(null); mgtGoodsEditSkuParam.setSkuSpecList(null);
} }
} }
ResponseDto<Object> goodsParamsValidForErpResp = this.goodsParamsValidForErp(
if (StringUtils.equals(mgtGoodsEditSkuParam.getErpHosting(), "1")) { mgtGoodsEditSkuParam.getErpHosting(), goodsInfoVo.getSpuErpCode(), mgtGoodsEditSkuParam.getSkuErpCode(), mgtGoodsEditSkuParam.getErpWarehouseNo());
if (StringUtils.isBlank(goodsInfoVo.getSpuErpCode())) { if (!goodsParamsValidForErpResp.isSuccess()) {
return ResponseDto.failure(ErrorMapping.get("149022")); return goodsParamsValidForErpResp;
}
if (StringUtils.isBlank(mgtGoodsEditSkuParam.getSkuErpCode())) {
return ResponseDto.failure(ErrorMapping.get("149023"));
}
if (StringUtils.isBlank(mgtGoodsEditSkuParam.getErpWarehouseNo())) {
return ResponseDto.failure(ErrorMapping.get("149024"));
}
} }
String buyRoster = mgtGoodsEditSkuParam.getBuyRoster(), befBuyRoster = mgtGoodsSkuInfoVo.getBuyRoster(); String buyRoster = mgtGoodsEditSkuParam.getBuyRoster(), befBuyRoster = mgtGoodsSkuInfoVo.getBuyRoster();
...@@ -966,6 +969,12 @@ public class GoblinStoreMgtGoodsController { ...@@ -966,6 +969,12 @@ public class GoblinStoreMgtGoodsController {
} }
break; break;
} }
ResponseDto<Object> goodsParamsValidForErpResp = this.goodsParamsValidForErp(
mgtDigitalGoodsEditSkuParam.getErpHosting(), mgtGoodsInfoVo.getSpuErpCode(), mgtDigitalGoodsEditSkuParam.getSkuErpCode(), mgtDigitalGoodsEditSkuParam.getErpWarehouseNo());
if (!goodsParamsValidForErpResp.isSuccess()) {
return goodsParamsValidForErpResp;
}
if (log.isDebugEnabled()) { if (log.isDebugEnabled()) {
log.debug("商品管理:商品编辑:SKU编辑-数字藏品:[GoblinStoreMgtGoodsEditSkuParam={}]", JsonUtils.toJson(mgtDigitalGoodsEditSkuParam)); log.debug("商品管理:商品编辑:SKU编辑-数字藏品:[GoblinStoreMgtGoodsEditSkuParam={}]", JsonUtils.toJson(mgtDigitalGoodsEditSkuParam));
} }
...@@ -1084,16 +1093,10 @@ public class GoblinStoreMgtGoodsController { ...@@ -1084,16 +1093,10 @@ public class GoblinStoreMgtGoodsController {
} }
} }
} }
if (StringUtils.equals(mgtGoodsEditSkuParam.getErpHosting(), "1")) { ResponseDto<Object> goodsParamsValidForErpResp = this.goodsParamsValidForErp(
if (StringUtils.isBlank(goodsInfoVo.getSpuErpCode())) { mgtGoodsEditSkuParam.getErpHosting(), goodsInfoVo.getSpuErpCode(), mgtGoodsEditSkuParam.getSkuErpCode(), mgtGoodsEditSkuParam.getErpWarehouseNo());
return ResponseDto.failure(ErrorMapping.get("149022")); if (!goodsParamsValidForErpResp.isSuccess()) {
} return goodsParamsValidForErpResp;
if (StringUtils.isBlank(mgtGoodsEditSkuParam.getSkuErpCode())) {
return ResponseDto.failure(ErrorMapping.get("149023"));
}
if (StringUtils.isBlank(mgtGoodsEditSkuParam.getErpWarehouseNo())) {
return ResponseDto.failure(ErrorMapping.get("149024"));
}
} }
if (log.isDebugEnabled()) { if (log.isDebugEnabled()) {
...@@ -1170,10 +1173,17 @@ public class GoblinStoreMgtGoodsController { ...@@ -1170,10 +1173,17 @@ public class GoblinStoreMgtGoodsController {
if ("3".equals(mgtDigitalGoodsAddSkuParam.getShelvesHandle()) && StringUtils.isEmpty(mgtDigitalGoodsAddSkuParam.getShelvesTime())) { if ("3".equals(mgtDigitalGoodsAddSkuParam.getShelvesHandle()) && StringUtils.isEmpty(mgtDigitalGoodsAddSkuParam.getShelvesTime())) {
return ResponseDto.failure(ErrorCode.HTTP_PARAM_ERROR.getCode(), "请指定预约上架时间"); return ResponseDto.failure(ErrorCode.HTTP_PARAM_ERROR.getCode(), "请指定预约上架时间");
} }
ResponseDto<Object> goodsParamsValidForErpResp = this.goodsParamsValidForErp(
mgtDigitalGoodsAddSkuParam.getErpHosting(), goodsInfoVo.getSpuErpCode(), mgtDigitalGoodsAddSkuParam.getSkuErpCode(), mgtDigitalGoodsAddSkuParam.getErpWarehouseNo());
if (!goodsParamsValidForErpResp.isSuccess()) {
return goodsParamsValidForErpResp;
}
if (log.isDebugEnabled()) { if (log.isDebugEnabled()) {
log.debug("商品管理:商品编辑:SKU添加:[GoblinStoreMgtGoodsEditSkuParam={}]", JsonUtils.toJson(mgtDigitalGoodsAddSkuParam)); log.debug("商品管理:商品编辑:SKU添加:[GoblinStoreMgtGoodsEditSkuParam={}]", JsonUtils.toJson(mgtDigitalGoodsAddSkuParam));
} }
GoblinGoodsSkuInfoVo initGoodsSkuInfoVo = mgtDigitalGoodsAddSkuParam.initAddGoodsSkuInfoVo(notUnboxFlg); GoblinGoodsSkuInfoVo initGoodsSkuInfoVo = mgtDigitalGoodsAddSkuParam.initAddGoodsSkuInfoVo(notUnboxFlg);
initGoodsSkuInfoVo.setErpType(goodsInfoVo.getErpType());
initGoodsSkuInfoVo.setPriceV(priceVNode.decimalValue()); initGoodsSkuInfoVo.setPriceV(priceVNode.decimalValue());
{// 标签处理 {// 标签处理
List<String> paramExtagList = mgtDigitalGoodsAddSkuParam.getExtagList(); List<String> paramExtagList = mgtDigitalGoodsAddSkuParam.getExtagList();
...@@ -1233,4 +1243,22 @@ public class GoblinStoreMgtGoodsController { ...@@ -1233,4 +1243,22 @@ public class GoblinStoreMgtGoodsController {
boolean delResultFlg = goblinstoreMgtGoodsService.goodsEditSkuDel(currentUid, mgtGoodsSkuInfoVo, mgtGoodsInfoVo); boolean delResultFlg = goblinstoreMgtGoodsService.goodsEditSkuDel(currentUid, mgtGoodsSkuInfoVo, mgtGoodsInfoVo);
return delResultFlg ? ResponseDto.success() : ResponseDto.failure(ErrorMapping.get("149003")); return delResultFlg ? ResponseDto.success() : ResponseDto.failure(ErrorMapping.get("149003"));
} }
/**
* 商品操作ERP属性校验逻辑
*/
private ResponseDto<Object> goodsParamsValidForErp(String erpHosting, String spuErpCode, String skuErpCode, String erpWarehouseNo) {
if (StringUtils.equals(erpHosting, "1")) {
if (StringUtils.isBlank(spuErpCode)) {
return ResponseDto.failure(ErrorMapping.get("149022"));
}
if (StringUtils.isBlank(skuErpCode)) {
return ResponseDto.failure(ErrorMapping.get("149023"));
}
if (StringUtils.isBlank(erpWarehouseNo)) {
return ResponseDto.failure(ErrorMapping.get("149024"));
}
}
return ResponseDto.success();
}
} }
...@@ -249,7 +249,7 @@ public class GoblinStoreMgtGoodsServiceImpl implements IGoblinstoreMgtGoodsServi ...@@ -249,7 +249,7 @@ public class GoblinStoreMgtGoodsServiceImpl implements IGoblinstoreMgtGoodsServi
spuId, goodsInfoVo.getSpuNo(), goodsInfoVo.getSpuType(), goodsInfoVo.getName(), goodsInfoVo.getIntro(), spuId, goodsInfoVo.getSpuNo(), goodsInfoVo.getSpuType(), goodsInfoVo.getName(), goodsInfoVo.getIntro(),
goodsInfoVo.getAttention(), goodsInfoVo.getStoreId(), goodsInfoVo.getCateFid(), goodsInfoVo.getCateSid(), goodsInfoVo.getCateTid(), goodsInfoVo.getAttention(), goodsInfoVo.getStoreId(), goodsInfoVo.getCateFid(), goodsInfoVo.getCateSid(), goodsInfoVo.getCateTid(),
goodsInfoVo.getVirtualFlg(), goodsInfoVo.getStatus(), goodsInfoVo.getShelvesStatus(), goodsInfoVo.getSpuAppear(), goodsInfoVo.getAuthor(), goodsInfoVo.getVirtualFlg(), goodsInfoVo.getStatus(), goodsInfoVo.getShelvesStatus(), goodsInfoVo.getSpuAppear(), goodsInfoVo.getAuthor(),
goodsInfoVo.getPublisher(), goodsInfoVo.getCreatedBy(), goodsInfoVo.getCreatedAt() goodsInfoVo.getPublisher(), goodsInfoVo.getCreatedBy(), goodsInfoVo.getCreatedAt(), goodsInfoVo.getSpuErpCode()
}); });
toMqSqls.add(SqlMapping.get("goblin_goods_tag.insert_byreplace")); toMqSqls.add(SqlMapping.get("goblin_goods_tag.insert_byreplace"));
LinkedList<Object[]> initGoodsTagObjs = CollectionUtil.linkedListObjectArr(); LinkedList<Object[]> initGoodsTagObjs = CollectionUtil.linkedListObjectArr();
...@@ -621,7 +621,7 @@ public class GoblinStoreMgtGoodsServiceImpl implements IGoblinstoreMgtGoodsServi ...@@ -621,7 +621,7 @@ public class GoblinStoreMgtGoodsServiceImpl implements IGoblinstoreMgtGoodsServi
LinkedList<Object[]> updateGoodsInfoObjs = CollectionUtil.linkedListObjectArr(); LinkedList<Object[]> updateGoodsInfoObjs = CollectionUtil.linkedListObjectArr();
updateGoodsInfoObjs.add(new Object[]{ updateGoodsInfoObjs.add(new Object[]{
updateSpuInfoVo.getName(), updateSpuInfoVo.getIntro(), updateSpuInfoVo.getCateFid(), updateSpuInfoVo.getCateSid(), updateSpuInfoVo.getName(), updateSpuInfoVo.getIntro(), updateSpuInfoVo.getCateFid(), updateSpuInfoVo.getCateSid(),
updateSpuInfoVo.getCateTid(), updateSpuInfoVo.getUpdatedBy(), updateSpuInfoVo.getUpdatedAt(), updateSpuInfoVo.getSpuId() updateSpuInfoVo.getCateTid(), updateSpuInfoVo.getUpdatedBy(), updateSpuInfoVo.getUpdatedAt(), updateSpuInfoVo.getSpuErpCode(), updateSpuInfoVo.getSpuId()
}); });
toMqSqls.add(SqlMapping.get("goblin_goods_tag.delete")); toMqSqls.add(SqlMapping.get("goblin_goods_tag.delete"));
LinkedList<Object[]> deleteGoodsTagObjs = CollectionUtil.linkedListObjectArr(); LinkedList<Object[]> deleteGoodsTagObjs = CollectionUtil.linkedListObjectArr();
...@@ -852,7 +852,7 @@ public class GoblinStoreMgtGoodsServiceImpl implements IGoblinstoreMgtGoodsServi ...@@ -852,7 +852,7 @@ public class GoblinStoreMgtGoodsServiceImpl implements IGoblinstoreMgtGoodsServi
updateSkuInfoVo.getName(), updateSkuInfoVo.getSubtitle(), updateSkuInfoVo.getSkuPic(), updateSkuInfoVo.getSkuWatch(), updateSkuInfoVo.getWatchType(), updateSkuInfoVo.getName(), updateSkuInfoVo.getSubtitle(), updateSkuInfoVo.getSkuPic(), updateSkuInfoVo.getSkuWatch(), updateSkuInfoVo.getWatchType(),
updateSkuInfoVo.getSkuWatchPic(), updateSkuInfoVo.getPrice(), updateSkuInfoVo.getPriceMember(), updateSkuInfoVo.getIntro(), updateSkuInfoVo.getDetails(), updateSkuInfoVo.getSkuWatchPic(), updateSkuInfoVo.getPrice(), updateSkuInfoVo.getPriceMember(), updateSkuInfoVo.getIntro(), updateSkuInfoVo.getDetails(),
updateSkuInfoVo.getShelvesHandle(), updateSkuInfoVo.getShelvesTime(), updateSkuInfoVo.getSaleStartTime(), updateSkuInfoVo.getOpeningTime(), updateSkuInfoVo.getUpdatedBy(), updateSkuInfoVo.getShelvesHandle(), updateSkuInfoVo.getShelvesTime(), updateSkuInfoVo.getSaleStartTime(), updateSkuInfoVo.getOpeningTime(), updateSkuInfoVo.getUpdatedBy(),
updateSkuInfoVo.getUpdatedAt(), skuId updateSkuInfoVo.getUpdatedAt(), updateSkuInfoVo.getSkuErpCode(), updateSkuInfoVo.getErpHosting(), updateSkuInfoVo.getErpWarehouseNo(), skuId
}); });
} else { } else {
// String buyRoster = mgtDigitalGoodsAddSkuParam.getBuyRoster(); // String buyRoster = mgtDigitalGoodsAddSkuParam.getBuyRoster();
...@@ -864,7 +864,7 @@ public class GoblinStoreMgtGoodsServiceImpl implements IGoblinstoreMgtGoodsServi ...@@ -864,7 +864,7 @@ public class GoblinStoreMgtGoodsServiceImpl implements IGoblinstoreMgtGoodsServi
updateGoodsSkuObjs.add(new Object[]{ updateGoodsSkuObjs.add(new Object[]{
updateSkuInfoVo.getHitRatio(), updateSkuInfoVo.getBuyFactor(), updateSkuInfoVo.getBuyLimit(), updateSkuInfoVo.getSkuAppear(), updateSkuInfoVo.getSkuCanbuy(), updateSkuInfoVo.getHitRatio(), updateSkuInfoVo.getBuyFactor(), updateSkuInfoVo.getBuyLimit(), updateSkuInfoVo.getSkuAppear(), updateSkuInfoVo.getSkuCanbuy(),
updateSkuInfoVo.getShelvesHandle(), updateSkuInfoVo.getShelvesTime(), updateSkuInfoVo.getSaleStartTime(), updateSkuInfoVo.getUpdatedBy(), updateSkuInfoVo.getUpdatedAt(), updateSkuInfoVo.getShelvesHandle(), updateSkuInfoVo.getShelvesTime(), updateSkuInfoVo.getSaleStartTime(), updateSkuInfoVo.getUpdatedBy(), updateSkuInfoVo.getUpdatedAt(),
skuId updateSkuInfoVo.getSkuErpCode(), updateSkuInfoVo.getErpHosting(), updateSkuInfoVo.getErpWarehouseNo(), skuId
}); });
} }
toMqSqls.add(SqlMapping.get("goblin_goods.update_by_edit_sku")); toMqSqls.add(SqlMapping.get("goblin_goods.update_by_edit_sku"));
...@@ -1060,7 +1060,8 @@ public class GoblinStoreMgtGoodsServiceImpl implements IGoblinstoreMgtGoodsServi ...@@ -1060,7 +1060,8 @@ public class GoblinStoreMgtGoodsServiceImpl implements IGoblinstoreMgtGoodsServi
initGoodsSkuInfoVo.getProductId(), initGoodsSkuInfoVo.getPriceMember(), initGoodsSkuInfoVo.getIntro(), initGoodsSkuInfoVo.getDetails(), initGoodsSkuInfoVo.getBuyFactor(), initGoodsSkuInfoVo.getProductId(), initGoodsSkuInfoVo.getPriceMember(), initGoodsSkuInfoVo.getIntro(), initGoodsSkuInfoVo.getDetails(), initGoodsSkuInfoVo.getBuyFactor(),
initGoodsSkuInfoVo.getBuyLimit(), initGoodsSkuInfoVo.getStoreId(), initGoodsSkuInfoVo.getShelvesHandle(), initGoodsSkuInfoVo.getShelvesTime(), initGoodsSkuInfoVo.getSaleStartTime(), initGoodsSkuInfoVo.getBuyLimit(), initGoodsSkuInfoVo.getStoreId(), initGoodsSkuInfoVo.getShelvesHandle(), initGoodsSkuInfoVo.getShelvesTime(), initGoodsSkuInfoVo.getSaleStartTime(),
initGoodsSkuInfoVo.getVirtualFlg(), initGoodsSkuInfoVo.getStatus(), initGoodsSkuInfoVo.getShelvesStatus(), initGoodsSkuInfoVo.getSkuAppear(), initGoodsSkuInfoVo.getSkuCanbuy(), initGoodsSkuInfoVo.getVirtualFlg(), initGoodsSkuInfoVo.getStatus(), initGoodsSkuInfoVo.getShelvesStatus(), initGoodsSkuInfoVo.getSkuAppear(), initGoodsSkuInfoVo.getSkuCanbuy(),
initGoodsSkuInfoVo.getUnbox(), initGoodsSkuInfoVo.getOpeningTime(), initGoodsSkuInfoVo.getShelvesAt(), uid, now initGoodsSkuInfoVo.getUnbox(), initGoodsSkuInfoVo.getOpeningTime(), initGoodsSkuInfoVo.getShelvesAt(), uid, now,
initGoodsSkuInfoVo.getSkuErpCode(), initGoodsSkuInfoVo.getErpType(), initGoodsSkuInfoVo.getErpHosting(), initGoodsSkuInfoVo.getErpWarehouseNo()
}); });
toMqSqls.add(SqlMapping.get("goblin_goods_sku_nft.insert_for_digital")); toMqSqls.add(SqlMapping.get("goblin_goods_sku_nft.insert_for_digital"));
LinkedList<Object[]> initGoodsSkuNftObjs = CollectionUtil.linkedListObjectArr(); LinkedList<Object[]> initGoodsSkuNftObjs = CollectionUtil.linkedListObjectArr();
......
...@@ -36,10 +36,12 @@ goblin_goods_sku_spec_value.update_by_del_sku=UPDATE goblin_goods_sku_spec_value ...@@ -36,10 +36,12 @@ goblin_goods_sku_spec_value.update_by_del_sku=UPDATE goblin_goods_sku_spec_value
#---- \u5546\u54C1\u4FE1\u606F #---- \u5546\u54C1\u4FE1\u606F
#goblin_goods.insert=INSERT INTO goblin_goods (spu_id,spu_no,spu_bar_code,name,subtitle,sell_price, price_ge,price_le,intro,details,cover_pic, video,spec_mode,store_id,cate_fid,cate_sid, cate_tid,store_cate_fid,store_cate_sid,store_cate_tid,brand_id, shelves_handle,shelves_time,spu_validity,virtual_flg,status, shelves_status,spu_appear,shelves_at,created_by,created_at, logistics_template)VALUES(?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?) #goblin_goods.insert=INSERT INTO goblin_goods (spu_id,spu_no,spu_bar_code,name,subtitle,sell_price, price_ge,price_le,intro,details,cover_pic, video,spec_mode,store_id,cate_fid,cate_sid, cate_tid,store_cate_fid,store_cate_sid,store_cate_tid,brand_id, shelves_handle,shelves_time,spu_validity,virtual_flg,status, shelves_status,spu_appear,shelves_at,created_by,created_at, logistics_template)VALUES(?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?)
goblin_goods.insert=INSERT INTO goblin_goods (spu_id,spu_no,spu_bar_code,spu_erp_code,erp_type,name,subtitle,sell_price, price_ge,price_le,intro,details,cover_pic, video,spec_mode,store_id,cate_fid,cate_sid, cate_tid,store_cate_fid,store_cate_sid,store_cate_tid,brand_id, shelves_handle,shelves_time,spu_validity,virtual_flg,status, shelves_status,spu_appear,shelves_at,created_by,created_at, logistics_template)VALUES(?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?) goblin_goods.insert=INSERT INTO goblin_goods (spu_id,spu_no,spu_bar_code,spu_erp_code,erp_type,name,subtitle,sell_price, price_ge,price_le,intro,details,cover_pic, video,spec_mode,store_id,cate_fid,cate_sid, cate_tid,store_cate_fid,store_cate_sid,store_cate_tid,brand_id, shelves_handle,shelves_time,spu_validity,virtual_flg,status, shelves_status,spu_appear,shelves_at,created_by,created_at, logistics_template)VALUES(?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?)
goblin_goods.insert_for_digital=INSERT INTO goblin_goods (spu_id,spu_no,spu_type,name,intro,attention,store_id,cate_fid,cate_sid,cate_tid,virtual_flg,status,shelves_status,spu_appear,author,publisher,created_by,created_at)VALUES(?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?) #goblin_goods.insert_for_digital=INSERT INTO goblin_goods (spu_id,spu_no,spu_type,name,intro,attention,store_id,cate_fid,cate_sid,cate_tid,virtual_flg,status,shelves_status,spu_appear,author,publisher,created_by,created_at)VALUES(?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?)
goblin_goods.insert_for_digital=INSERT INTO goblin_goods (spu_id,spu_no,spu_type,name,intro,attention,store_id,cate_fid,cate_sid,cate_tid,virtual_flg,status,shelves_status,spu_appear,author,publisher,created_by,created_at,spu_erp_code)VALUES(?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?)
#goblin_goods.update_by_edit=UPDATE goblin_goods SET spu_no=?,name=?,subtitle=?,sell_price=?,intro=?,details=?,cover_pic=?,video=?,spec_mode=?,cate_fid=?,cate_sid=?,cate_tid=?,shelves_handle=?,shelves_time=?,spu_validity=?,virtual_flg=?,logistics_template=?,updated_by=?,updated_at=? WHERE spu_id=? AND del_flg='0' #goblin_goods.update_by_edit=UPDATE goblin_goods SET spu_no=?,name=?,subtitle=?,sell_price=?,intro=?,details=?,cover_pic=?,video=?,spec_mode=?,cate_fid=?,cate_sid=?,cate_tid=?,shelves_handle=?,shelves_time=?,spu_validity=?,virtual_flg=?,logistics_template=?,updated_by=?,updated_at=? WHERE spu_id=? AND del_flg='0'
goblin_goods.update_by_edit=UPDATE goblin_goods SET spu_no=?,name=?,subtitle=?,sell_price=?,intro=?,details=?,cover_pic=?,video=?,spec_mode=?,cate_fid=?,cate_sid=?,cate_tid=?,shelves_handle=?,shelves_time=?,spu_validity=?,virtual_flg=?,logistics_template=?,updated_by=?,updated_at=?,spu_erp_code=? WHERE spu_id=? AND del_flg='0' goblin_goods.update_by_edit=UPDATE goblin_goods SET spu_no=?,name=?,subtitle=?,sell_price=?,intro=?,details=?,cover_pic=?,video=?,spec_mode=?,cate_fid=?,cate_sid=?,cate_tid=?,shelves_handle=?,shelves_time=?,spu_validity=?,virtual_flg=?,logistics_template=?,updated_by=?,updated_at=?,spu_erp_code=? WHERE spu_id=? AND del_flg='0'
goblin_goods.update_by_edit_for_digital=UPDATE goblin_goods SET name=?,intro=?,cate_fid=?,cate_sid=?,cate_tid=?,updated_by=?,updated_at=? WHERE spu_id=? AND del_flg='0' #goblin_goods.update_by_edit_for_digital=UPDATE goblin_goods SET name=?,intro=?,cate_fid=?,cate_sid=?,cate_tid=?,updated_by=?,updated_at=? WHERE spu_id=? AND del_flg='0'
goblin_goods.update_by_edit_for_digital=UPDATE goblin_goods SET name=?,intro=?,cate_fid=?,cate_sid=?,cate_tid=?,updated_by=?,updated_at=?,spu_erp_code=? WHERE spu_id=? AND del_flg='0'
goblin_goods.update_by_shelves=UPDATE goblin_goods SET shelves_status=?,shelves_at=?,updated_by=?,updated_at=? WHERE spu_id=? AND store_id=? AND spu_appear='0' goblin_goods.update_by_shelves=UPDATE goblin_goods SET shelves_status=?,shelves_at=?,updated_by=?,updated_at=? WHERE spu_id=? AND store_id=? AND spu_appear='0'
goblin_goods.update_by_unshelves=UPDATE goblin_goods SET shelves_handle=?,shelves_status=?,shelves_at=?,updated_by=?,updated_at=? WHERE spu_id=? AND store_id=? AND spu_appear='0' goblin_goods.update_by_unshelves=UPDATE goblin_goods SET shelves_handle=?,shelves_status=?,shelves_at=?,updated_by=?,updated_at=? WHERE spu_id=? AND store_id=? AND spu_appear='0'
goblin_goods.update_by_status=UPDATE goblin_goods SET spu_appear=?,updated_by=?,updated_at=? WHERE store_id=? AND del_flg='0' goblin_goods.update_by_status=UPDATE goblin_goods SET spu_appear=?,updated_by=?,updated_at=? WHERE store_id=? AND del_flg='0'
...@@ -50,13 +52,16 @@ goblin_goods.update_by_del_store=UPDATE goblin_goods SET del_flg='1',updated_by= ...@@ -50,13 +52,16 @@ goblin_goods.update_by_del_store=UPDATE goblin_goods SET del_flg='1',updated_by=
goblin_goods.update_by_del=UPDATE goblin_goods SET del_flg='1',updated_by=?,updated_at=?,deleted_by=?,deleted_at=? WHERE spu_id=? AND del_flg='0' goblin_goods.update_by_del=UPDATE goblin_goods SET del_flg='1',updated_by=?,updated_at=?,deleted_by=?,deleted_at=? WHERE spu_id=? AND del_flg='0'
#goblin_goods_sku.insert=INSERT INTO goblin_goods_sku (sku_id,spu_id,sku_no,sku_bar_code,name,subtitle, sell_price,sku_pic,sku_isbn,stock,sku_stock, warning_stock,price,price_member,weight,buy_factor, buy_roster,buy_limit,store_id,sku_validity,virtual_flg, status,shelves_status,sku_appear,shelves_at,created_by, created_at,logistics_template)VALUES(?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?) #goblin_goods_sku.insert=INSERT INTO goblin_goods_sku (sku_id,spu_id,sku_no,sku_bar_code,name,subtitle, sell_price,sku_pic,sku_isbn,stock,sku_stock, warning_stock,price,price_member,weight,buy_factor, buy_roster,buy_limit,store_id,sku_validity,virtual_flg, status,shelves_status,sku_appear,shelves_at,created_by, created_at,logistics_template)VALUES(?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?)
goblin_goods_sku.insert=INSERT INTO goblin_goods_sku (sku_id,spu_id,sku_no,sku_bar_code,sku_erp_code,erp_type,erp_hosting,erp_warehouse_no,name,subtitle, sell_price,sku_pic,sku_isbn,stock,sku_stock, warning_stock,price,price_member,weight,buy_factor, buy_roster,buy_limit,store_id,sku_validity,virtual_flg, status,shelves_status,sku_appear,shelves_at,created_by, created_at,logistics_template)VALUES(?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?) goblin_goods_sku.insert=INSERT INTO goblin_goods_sku (sku_id,spu_id,sku_no,sku_bar_code,sku_erp_code,erp_type,erp_hosting,erp_warehouse_no,name,subtitle, sell_price,sku_pic,sku_isbn,stock,sku_stock, warning_stock,price,price_member,weight,buy_factor, buy_roster,buy_limit,store_id,sku_validity,virtual_flg, status,shelves_status,sku_appear,shelves_at,created_by, created_at,logistics_template)VALUES(?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?)
goblin_goods_sku.insert_for_digital=INSERT INTO goblin_goods_sku (sku_id,spu_id,sku_no,sku_type,name,subtitle,sku_pic,sku_watch,watch_type,sku_watch_pic,stock,sku_stock,hit_ratio,price,price_v,product_id,price_member,intro,details,buy_factor,buy_limit,store_id,shelves_handle,shelves_time,sale_start_time,virtual_flg,status,shelves_status,sku_appear,sku_canbuy,unbox,opening_time,shelves_at,created_by,created_at)VALUES(?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?) #goblin_goods_sku.insert_for_digital=INSERT INTO goblin_goods_sku (sku_id,spu_id,sku_no,sku_type,name,subtitle,sku_pic,sku_watch,watch_type,sku_watch_pic,stock,sku_stock,hit_ratio,price,price_v,product_id,price_member,intro,details,buy_factor,buy_limit,store_id,shelves_handle,shelves_time,sale_start_time,virtual_flg,status,shelves_status,sku_appear,sku_canbuy,unbox,opening_time,shelves_at,created_by,created_at)VALUES(?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?)
goblin_goods_sku.insert_for_digital=INSERT INTO goblin_goods_sku (sku_id,spu_id,sku_no,sku_type,name,subtitle,sku_pic,sku_watch,watch_type,sku_watch_pic,stock,sku_stock,hit_ratio,price,price_v,product_id,price_member,intro,details,buy_factor,buy_limit,store_id,shelves_handle,shelves_time,sale_start_time,virtual_flg,status,shelves_status,sku_appear,sku_canbuy,unbox,opening_time,shelves_at,created_by,created_at,sku_erp_code,erp_type,erp_hosting,erp_warehouse_no)VALUES(?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?)
#goblin_goods_sku.update_by_edit_for_market=UPDATE goblin_goods_sku SET sku_bar_code=?,name=?,sku_pic=?,sell_price=?,weight=?,stock=?,warning_stock=?,sku_appear=?,sku_isbn=?,sku_validity=?,updated_by=?,updated_at=? WHERE sku_id=? AND del_flg='0' #goblin_goods_sku.update_by_edit_for_market=UPDATE goblin_goods_sku SET sku_bar_code=?,name=?,sku_pic=?,sell_price=?,weight=?,stock=?,warning_stock=?,sku_appear=?,sku_isbn=?,sku_validity=?,updated_by=?,updated_at=? WHERE sku_id=? AND del_flg='0'
goblin_goods_sku.update_by_edit_for_market=UPDATE goblin_goods_sku SET sku_bar_code=?,name=?,sku_pic=?,sell_price=?,weight=?,stock=?,warning_stock=?,sku_appear=?,sku_isbn=?,sku_validity=?,updated_by=?,updated_at=?,sku_erp_code=?,erp_hosting=?,erp_warehouse_no=? WHERE sku_id=? AND del_flg='0' goblin_goods_sku.update_by_edit_for_market=UPDATE goblin_goods_sku SET sku_bar_code=?,name=?,sku_pic=?,sell_price=?,weight=?,stock=?,warning_stock=?,sku_appear=?,sku_isbn=?,sku_validity=?,updated_by=?,updated_at=?,sku_erp_code=?,erp_hosting=?,erp_warehouse_no=? WHERE sku_id=? AND del_flg='0'
#goblin_goods_sku.update_by_edit=UPDATE goblin_goods_sku SET name=?,sku_pic=?,sell_price=?,price=?,price_member=?,weight=?,stock=?,sku_stock=?,warning_stock=?,sku_appear=?,sku_isbn=?,buy_factor=?,buy_roster=?,buy_limit=?,sku_validity=?,updated_by=?,updated_at=? WHERE sku_id=? AND del_flg='0' #goblin_goods_sku.update_by_edit=UPDATE goblin_goods_sku SET name=?,sku_pic=?,sell_price=?,price=?,price_member=?,weight=?,stock=?,sku_stock=?,warning_stock=?,sku_appear=?,sku_isbn=?,buy_factor=?,buy_roster=?,buy_limit=?,sku_validity=?,updated_by=?,updated_at=? WHERE sku_id=? AND del_flg='0'
goblin_goods_sku.update_by_edit=UPDATE goblin_goods_sku SET name=?,sku_pic=?,sell_price=?,price=?,price_member=?,weight=?,stock=?,sku_stock=?,warning_stock=?,sku_appear=?,sku_isbn=?,buy_factor=?,buy_roster=?,buy_limit=?,sku_validity=?,updated_by=?,updated_at=?,sku_erp_code=?,erp_hosting=?,erp_warehouse_no=? WHERE sku_id=? AND del_flg='0' goblin_goods_sku.update_by_edit=UPDATE goblin_goods_sku SET name=?,sku_pic=?,sell_price=?,price=?,price_member=?,weight=?,stock=?,sku_stock=?,warning_stock=?,sku_appear=?,sku_isbn=?,buy_factor=?,buy_roster=?,buy_limit=?,sku_validity=?,updated_by=?,updated_at=?,sku_erp_code=?,erp_hosting=?,erp_warehouse_no=? WHERE sku_id=? AND del_flg='0'
goblin_goods_sku.update_by_edit_for_digital=UPDATE goblin_goods_sku SET hit_ratio=?,buy_factor=?,buy_limit=?,sku_appear=?,sku_canbuy=?,shelves_handle=?,shelves_time=?,sale_start_time=?,updated_by=?,updated_at=? WHERE sku_id=? AND del_flg='0' #goblin_goods_sku.update_by_edit_for_digital=UPDATE goblin_goods_sku SET hit_ratio=?,buy_factor=?,buy_limit=?,sku_appear=?,sku_canbuy=?,shelves_handle=?,shelves_time=?,sale_start_time=?,updated_by=?,updated_at=? WHERE sku_id=? AND del_flg='0'
goblin_goods_sku.update_by_edit_box_digital=UPDATE goblin_goods_sku SET name=?,subtitle=?,sku_pic=?,sku_watch=?,watch_type=?,sku_watch_pic=?,price=?,price_member=?,intro=?,details=?,shelves_handle=?,shelves_time=?,sale_start_time=?,opening_time=?,updated_by=?,updated_at=? WHERE sku_id=? AND del_flg='0' goblin_goods_sku.update_by_edit_for_digital=UPDATE goblin_goods_sku SET hit_ratio=?,buy_factor=?,buy_limit=?,sku_appear=?,sku_canbuy=?,shelves_handle=?,shelves_time=?,sale_start_time=?,updated_by=?,updated_at=?,sku_erp_code=?,erp_hosting=?,erp_warehouse_no=? WHERE sku_id=? AND del_flg='0'
#goblin_goods_sku.update_by_edit_box_digital=UPDATE goblin_goods_sku SET name=?,subtitle=?,sku_pic=?,sku_watch=?,watch_type=?,sku_watch_pic=?,price=?,price_member=?,intro=?,details=?,shelves_handle=?,shelves_time=?,sale_start_time=?,opening_time=?,updated_by=?,updated_at=? WHERE sku_id=? AND del_flg='0'
goblin_goods_sku.update_by_edit_box_digital=UPDATE goblin_goods_sku SET name=?,subtitle=?,sku_pic=?,sku_watch=?,watch_type=?,sku_watch_pic=?,price=?,price_member=?,intro=?,details=?,shelves_handle=?,shelves_time=?,sale_start_time=?,opening_time=?,updated_by=?,updated_at=?,sku_erp_code=?,erp_hosting=?,erp_warehouse_no=? WHERE sku_id=? AND del_flg='0'
goblin_goods_sku.update_by_edit_spu=UPDATE goblin_goods_sku SET sku_no=?,virtual_flg=?,logistics_template=?,updated_by=?,updated_at=? WHERE spu_id=? AND del_flg='0' goblin_goods_sku.update_by_edit_spu=UPDATE goblin_goods_sku SET sku_no=?,virtual_flg=?,logistics_template=?,updated_by=?,updated_at=? WHERE spu_id=? AND del_flg='0'
goblin_goods_sku.update_by_shelves=UPDATE goblin_goods_sku SET shelves_status=?,shelves_at=?,updated_by=?,updated_at=? WHERE sku_id=? AND store_id=? AND del_flg='0' goblin_goods_sku.update_by_shelves=UPDATE goblin_goods_sku SET shelves_status=?,shelves_at=?,updated_by=?,updated_at=? WHERE sku_id=? AND store_id=? AND del_flg='0'
goblin_goods_sku.update_by_soldout=UPDATE goblin_goods_sku SET soldout_status=?,updated_by=?,updated_at=? WHERE sku_id=? AND del_flg='0' goblin_goods_sku.update_by_soldout=UPDATE goblin_goods_sku SET soldout_status=?,updated_by=?,updated_at=? WHERE sku_id=? AND del_flg='0'
......
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