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

Commit 2b831cdc authored by 胡佳晨's avatar 胡佳晨

修改 多店铺 使用多张店铺券的bug

parent d958178c
...@@ -66,6 +66,7 @@ public class GoblinOrderServiceImpl implements IGoblinOrderService { ...@@ -66,6 +66,7 @@ public class GoblinOrderServiceImpl implements IGoblinOrderService {
List<String> skuAndPreListAndNumber = CollectionUtil.arrayListString(); List<String> skuAndPreListAndNumber = CollectionUtil.arrayListString();
List<String> platformCodeList = CollectionUtil.arrayListString(); List<String> platformCodeList = CollectionUtil.arrayListString();
List<String> storeCodeList = CollectionUtil.arrayListString(); List<String> storeCodeList = CollectionUtil.arrayListString();
List<String> storeSpuIds = CollectionUtil.linkedListString();
List<GoblinOrderSqlParam> orderSqlParams = ObjectUtil.getGoblinOrderSqlParamArrayListList(); List<GoblinOrderSqlParam> orderSqlParams = ObjectUtil.getGoblinOrderSqlParamArrayListList();
String orderMasterCode = IDGenerator.storeMasterCode();//总订单id String orderMasterCode = IDGenerator.storeMasterCode();//总订单id
...@@ -133,7 +134,8 @@ public class GoblinOrderServiceImpl implements IGoblinOrderService { ...@@ -133,7 +134,8 @@ public class GoblinOrderServiceImpl implements IGoblinOrderService {
preParam.setSkuName(preParam.getSkuName() + "," + pre.getSkuName()); preParam.setSkuName(preParam.getSkuName() + "," + pre.getSkuName());
preParam.setOrderIdList(preParam.getOrderIdList() + "," + pre.getOrderIdList()); preParam.setOrderIdList(preParam.getOrderIdList() + "," + pre.getOrderIdList());
preParam.setPlatformSpuIds(pre.getPlatformSpuIds()); preParam.setPlatformSpuIds(pre.getPlatformSpuIds());
preParam.setStoreSpuIds(pre.getStoreSpuIds()); storeSpuIds.addAll(pre.getStoreSpuIds());
preParam.setStoreSpuIds(storeSpuIds);
GoblinOrderSqlParam sqlParam = GoblinOrderSqlParam.getNew(); GoblinOrderSqlParam sqlParam = GoblinOrderSqlParam.getNew();
sqlParam.setStoreOrder(pre.getStoreOrder()); sqlParam.setStoreOrder(pre.getStoreOrder());
......
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