|
|
|
@ -265,13 +265,17 @@ public class OrderCreateHandleServiceImpl implements OrderCreateHandleService { |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
@Override |
|
|
|
|
public HighChildOrder integralRecharge(CreateOrderChildModel createOrderChild) { |
|
|
|
|
public HighChildOrder integralRecharge(HighOrder order , CreateOrderChildModel createOrderChild) { |
|
|
|
|
// 查询用户信息
|
|
|
|
|
HighUser user = userService.getDetailDataByUser(createOrderChild.getGoodsId()); |
|
|
|
|
if (user == null) { |
|
|
|
|
throw ErrorHelp.genException(SysCode.System, ErrorCode.COMMON_ERROR, "未找到用户信息"); |
|
|
|
|
} |
|
|
|
|
HighChildOrder childOrder = new HighChildOrder(); |
|
|
|
|
childOrder.setOrderNo(order.getOrderNo()); |
|
|
|
|
childOrder.setMemId(createOrderChild.getMemId()); |
|
|
|
|
childOrder.setMemName(createOrderChild.getMemName()); |
|
|
|
|
childOrder.setMemPhone(createOrderChild.getMemPhone()); |
|
|
|
|
childOrder.setChildOrderNo(OrderUtil.generateChildOrderNo()); |
|
|
|
|
childOrder.setGoodsType(OrderChildGoodsType.TYPE2.getNumber()); |
|
|
|
|
childOrder.setGoodsId(user.getId()); |
|
|
|
@ -597,7 +601,7 @@ public class OrderCreateHandleServiceImpl implements OrderCreateHandleService { |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
@Override |
|
|
|
|
public List<HighChildOrder> thirdPartyOrder(JSONObject object) throws Exception { |
|
|
|
|
public List<HighChildOrder> thirdPartyOrder(HighOrder order , JSONObject object) throws Exception { |
|
|
|
|
|
|
|
|
|
JSONObject jsonObject; |
|
|
|
|
|
|
|
|
@ -689,10 +693,10 @@ public class OrderCreateHandleServiceImpl implements OrderCreateHandleService { |
|
|
|
|
childOrder.setGoodsType(9); |
|
|
|
|
childOrder.setChildOrderNo(OrderUtil.generateChildOrderNo()); |
|
|
|
|
childOrder.setStoreId(object.getLong("storeCode")); |
|
|
|
|
childOrder.setChannelOrderNo(jsonObject.getJSONObject("data").getString("orderNo")); |
|
|
|
|
childOrder.setChannelOrderNo(orderNo); |
|
|
|
|
childOrder.setGoodsId(object.getLong("productId")); |
|
|
|
|
childOrder.setMemId(user.getId()); |
|
|
|
|
childOrder.setOrderNo(orderNo); |
|
|
|
|
childOrder.setOrderNo(order.getOrderNo()); |
|
|
|
|
childOrder.setMemName(user.getName()); |
|
|
|
|
childOrder.setMemPhone(user.getPhone()); |
|
|
|
|
childOrder.setStoreAddress(orderObject.getJSONObject("data").getString("storeAddress")); |
|
|
|
@ -755,9 +759,9 @@ public class OrderCreateHandleServiceImpl implements OrderCreateHandleService { |
|
|
|
|
childOrder.setMemName(user.getName()); |
|
|
|
|
childOrder.setMemPhone(user.getPhone()); |
|
|
|
|
childOrder.setChildOrderNo(OrderUtil.generateChildOrderNo()); |
|
|
|
|
childOrder.setOrderNo(orderNo); |
|
|
|
|
childOrder.setOrderNo(order.getOrderNo()); |
|
|
|
|
childOrder.setGoodsId(object.getLong("productId")); |
|
|
|
|
childOrder.setChannelOrderNo(jsonObject.getJSONObject("data").getString("orderNo")); |
|
|
|
|
childOrder.setChannelOrderNo(orderNo); |
|
|
|
|
childOrder.setStoreAddress(orderObject.getJSONObject("data").getJSONObject("kfcPlaceOrder").getString("storeAddress")); |
|
|
|
|
childOrder.setStoreName(orderObject.getJSONObject("data").getJSONObject("kfcPlaceOrder").getString("storeName")); |
|
|
|
|
childOrder.setGoodsName(childObject.getString("productName")); |
|
|
|
@ -802,6 +806,7 @@ public class OrderCreateHandleServiceImpl implements OrderCreateHandleService { |
|
|
|
|
childOrder.setChildOrderStatus(1); |
|
|
|
|
childOrder.setGoodsType(10); |
|
|
|
|
childOrder.setChildOrderNo(OrderUtil.generateChildOrderNo()); |
|
|
|
|
childOrder.setOrderNo(order.getOrderNo()); |
|
|
|
|
childOrder.setStoreId(object.getLong("storeCode")); |
|
|
|
|
childOrder.setGoodsId(memberProduct.getId()); |
|
|
|
|
childOrder.setGoodsName(memberProduct.getName()); |
|
|
|
|