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

Commit 6221ffb1 authored by 胡佳晨's avatar 胡佳晨

提交 测试

parent 3b21b559
...@@ -68,6 +68,7 @@ public class GoblinOrderServiceImpl implements IGoblinOrderService { ...@@ -68,6 +68,7 @@ public class GoblinOrderServiceImpl implements IGoblinOrderService {
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<String> storeSpuIds = CollectionUtil.linkedListString();
List<String> orderCodeList = CollectionUtil.linkedListString();
List<GoblinOrderSqlParam> orderSqlParams = ObjectUtil.getGoblinOrderSqlParamArrayListList(); List<GoblinOrderSqlParam> orderSqlParams = ObjectUtil.getGoblinOrderSqlParamArrayListList();
String orderMasterCode = IDGenerator.storeMasterCode();//总订单id String orderMasterCode = IDGenerator.storeMasterCode();//总订单id
...@@ -101,6 +102,7 @@ public class GoblinOrderServiceImpl implements IGoblinOrderService { ...@@ -101,6 +102,7 @@ public class GoblinOrderServiceImpl implements IGoblinOrderService {
for (GoblinOrderStoreParam storeParam : goblinOrderStoreParamList) {//商铺维度循环 for (GoblinOrderStoreParam storeParam : goblinOrderStoreParamList) {//商铺维度循环
String orderId = IDGenerator.nextSnowId(); String orderId = IDGenerator.nextSnowId();
String orderCode = IDGenerator.storeCode(orderId); String orderCode = IDGenerator.storeCode(orderId);
orderCodeList.add(orderCode);
for (GoblinOrderSkuParam skuParam : storeParam.getGoblinOrderSkuParamArrayList()) {//商品维度循环 for (GoblinOrderSkuParam skuParam : storeParam.getGoblinOrderSkuParamArrayList()) {//商品维度循环
String skuId = skuParam.getSkuId(); String skuId = skuParam.getSkuId();
int number = skuParam.getNumber(); int number = skuParam.getNumber();
...@@ -152,7 +154,7 @@ public class GoblinOrderServiceImpl implements IGoblinOrderService { ...@@ -152,7 +154,7 @@ public class GoblinOrderServiceImpl implements IGoblinOrderService {
// throw new Exception("参数异常"); // throw new Exception("参数异常");
} }
ResponseDto<GoblinPayInnerResultVo> data = payOrder(preParam, orderSqlParams, uid); ResponseDto<GoblinPayInnerResultVo> data = payOrder(preParam, orderSqlParams, uid);
data.getData().setOrderIdList(Arrays.asList(preParam.getOrderIdList().split(","))); data.getData().setOrderIdList(orderCodeList);
log.info(UserPathDto.setData("下单(唤起支付)", param, data)); log.info(UserPathDto.setData("下单(唤起支付)", param, data));
return data; return data;
} catch (Exception e) { } catch (Exception e) {
......
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