修改配置
This commit is contained in:
parent
e9c42bdb99
commit
2ecfce1f2f
@ -737,9 +737,9 @@ public class ShopProductBaseServiceImpl extends BaseServiceImpl<ShopProductBaseM
|
|||||||
String product_image_old = "";
|
String product_image_old = "";
|
||||||
if (productId == null) {
|
if (productId == null) {
|
||||||
// 生成商品ID:product_id
|
// 生成商品ID:product_id
|
||||||
List<Long> productIds= shopNumberSeqService.batchCreateNextNo("product_id",1);
|
List<Long> productIds = shopNumberSeqService.batchCreateNextNo("product_id", 1);
|
||||||
productId=productIds.get(0);
|
productId = productIds.get(0);
|
||||||
// productId = shopNumberSeqService.createNextNo("product_id");
|
// productId = shopNumberSeqService.createNextNo("product_id");
|
||||||
|
|
||||||
if (null == productId) {
|
if (null == productId) {
|
||||||
return Pair.of(false, I18nUtil._("生成商品编号异常!"));
|
return Pair.of(false, I18nUtil._("生成商品编号异常!"));
|
||||||
@ -1035,9 +1035,9 @@ public class ShopProductBaseServiceImpl extends BaseServiceImpl<ShopProductBaseM
|
|||||||
field_row.setProduct_item_seq_id(product_item_seq_id);
|
field_row.setProduct_item_seq_id(product_item_seq_id);
|
||||||
|
|
||||||
//这儿应该提前生成编号使用
|
//这儿应该提前生成编号使用
|
||||||
List<Long> itemIds= shopNumberSeqService.batchCreateNextNo("item_id",1);
|
List<Long> itemIds = shopNumberSeqService.batchCreateNextNo("item_id", 1);
|
||||||
item_id=itemIds.get(0);
|
item_id = itemIds.get(0);
|
||||||
// item_id = shopNumberSeqService.createNextNo("item_id");
|
// item_id = shopNumberSeqService.createNextNo("item_id");
|
||||||
|
|
||||||
if (null == item_id) {
|
if (null == item_id) {
|
||||||
return Pair.of(false, I18nUtil._("生成商品 ItemId 异常!"));
|
return Pair.of(false, I18nUtil._("生成商品 ItemId 异常!"));
|
||||||
@ -1214,7 +1214,7 @@ public class ShopProductBaseServiceImpl extends BaseServiceImpl<ShopProductBaseM
|
|||||||
boolean $flag = false;
|
boolean $flag = false;
|
||||||
List $rs_row = new ArrayList();
|
List $rs_row = new ArrayList();
|
||||||
ShopStoreBase $store_row = shopStoreBaseService.get(store_id);
|
ShopStoreBase $store_row = shopStoreBaseService.get(store_id);
|
||||||
List<Long> productIds= shopNumberSeqService.batchCreateNextNo("product_id",1);
|
List<Long> productIds = shopNumberSeqService.batchCreateNextNo("product_id", 1);
|
||||||
Long $product_id = productIds.get(0);
|
Long $product_id = productIds.get(0);
|
||||||
//Long $product_id = shopNumberSeqService.createNextNo("product_id");
|
//Long $product_id = shopNumberSeqService.createNextNo("product_id");
|
||||||
|
|
||||||
@ -1389,8 +1389,8 @@ public class ShopProductBaseServiceImpl extends BaseServiceImpl<ShopProductBaseM
|
|||||||
field_row.setProduct_item_seq_id(product_item_seq_id);
|
field_row.setProduct_item_seq_id(product_item_seq_id);
|
||||||
|
|
||||||
//这儿应该提前生成编号使用
|
//这儿应该提前生成编号使用
|
||||||
List<Long> itemIds= shopNumberSeqService.batchCreateNextNo("item_id",1);
|
List<Long> itemIds = shopNumberSeqService.batchCreateNextNo("item_id", 1);
|
||||||
item_id=itemIds.get(0);
|
item_id = itemIds.get(0);
|
||||||
//item_id = shopNumberSeqService.createNextNo("item_id");
|
//item_id = shopNumberSeqService.createNextNo("item_id");
|
||||||
|
|
||||||
if (null == item_id) {
|
if (null == item_id) {
|
||||||
@ -2074,11 +2074,11 @@ public class ShopProductBaseServiceImpl extends BaseServiceImpl<ShopProductBaseM
|
|||||||
|
|
||||||
Integer product_sale_num = Convert.toInt(product_index_row.get("product_sale_num"));
|
Integer product_sale_num = Convert.toInt(product_index_row.get("product_sale_num"));
|
||||||
|
|
||||||
// if (product_base_row != null) {
|
if (product_base_row != null) {
|
||||||
// // 获取店铺营业状态:1-开业营业中(且在营业时间内);12-开业打烊中(但在营业时间外) ;2-停业中;3-开业(或活动)筹备中;
|
// 获取店铺营业状态:1-开业营业中(且在营业时间内);12-开业打烊中(但在营业时间外) ;2-停业中;3-开业(或活动)筹备中;
|
||||||
// Pair<Integer, String> store_biz_state = shopStoreBaseService.getStoreBizState(Convert.toInt(product_base_row.get("store_id")));
|
Pair<Integer, String> store_biz_state = shopStoreBaseService.getStoreBizState(Convert.toInt(product_base_row.get("store_id")));
|
||||||
// product_base_row.put("store_biz_state", store_biz_state.getFirst());
|
product_base_row.put("store_biz_state", store_biz_state.getFirst());
|
||||||
// }
|
}
|
||||||
|
|
||||||
//虚拟销量
|
//虚拟销量
|
||||||
// todo 是否为商家后台访问
|
// todo 是否为商家后台访问
|
||||||
@ -4995,9 +4995,9 @@ public class ShopProductBaseServiceImpl extends BaseServiceImpl<ShopProductBaseM
|
|||||||
shopProductItemSeq.setProduct_item_seq_id(product_item_seq_id);
|
shopProductItemSeq.setProduct_item_seq_id(product_item_seq_id);
|
||||||
|
|
||||||
//这儿应该提前生成编号使用
|
//这儿应该提前生成编号使用
|
||||||
// item_id = shopNumberSeqService.createNextNo("item_id");
|
// item_id = shopNumberSeqService.createNextNo("item_id");
|
||||||
List<Long> itemIds= shopNumberSeqService.batchCreateNextNo("item_id",1);
|
List<Long> itemIds = shopNumberSeqService.batchCreateNextNo("item_id", 1);
|
||||||
item_id=itemIds.get(0);
|
item_id = itemIds.get(0);
|
||||||
if (null == item_id) {
|
if (null == item_id) {
|
||||||
throw new ApiException(I18nUtil._("生成商品ItemId异常!"));
|
throw new ApiException(I18nUtil._("生成商品ItemId异常!"));
|
||||||
} else {
|
} else {
|
||||||
|
|||||||
8
pom.xml
8
pom.xml
@ -593,7 +593,7 @@
|
|||||||
<forceTags>true</forceTags>
|
<forceTags>true</forceTags>
|
||||||
<imageTags>
|
<imageTags>
|
||||||
<imageTag>${project.version}</imageTag>
|
<imageTag>${project.version}</imageTag>
|
||||||
<imageTag>latest</imageTag>
|
<!-- <imageTag>latest</imageTag>-->
|
||||||
</imageTags>
|
</imageTags>
|
||||||
|
|
||||||
<!--定义容器启动命令,注意不能换行-->
|
<!--定义容器启动命令,注意不能换行-->
|
||||||
@ -601,9 +601,9 @@
|
|||||||
</entryPoint>
|
</entryPoint>
|
||||||
|
|
||||||
<!-- 添加额外的Dockerfile指令来清理不必要的文件 -->
|
<!-- 添加额外的Dockerfile指令来清理不必要的文件 -->
|
||||||
<runs>
|
<!-- <runs>-->
|
||||||
<run>rm -rf /root/.m2 && rm -rf /tmp/* && rm -rf /var/cache/*</run>
|
<!-- <run>rm -rf /root/.m2 && rm -rf /tmp/* && rm -rf /var/cache/*</run>-->
|
||||||
</runs>
|
<!-- </runs>-->
|
||||||
|
|
||||||
<resources>
|
<resources>
|
||||||
<resource>
|
<resource>
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user