| @@ -253,14 +253,14 @@ public class WxOrderController extends BaseController { | |||||
| data.put("pay_expire_seconds",14*60); | data.put("pay_expire_seconds",14*60); | ||||
| data.put("order_entry_schema",wxOrderService.getOrderEntrySchema(order.getMainOrderId())); | data.put("order_entry_schema",wxOrderService.getOrderEntrySchema(order.getMainOrderId())); | ||||
| // List<Map<String,String>> order_goods_info = new ArrayList<>(); | |||||
| // for (CreateOrderCallback.Good good:createOrderCallback.getGoods()) { | |||||
| // Map<String,String> map_info = new HashMap<>(); | |||||
| // map_info.put("goods_id",good.getGoodsId()); | |||||
| // map_info.put("merchant_uid","71070743816369953633"); | |||||
| // order_goods_info.add(map_info); | |||||
| // } | |||||
| // data.put("order_goods_info",order_goods_info); | |||||
| List<Map<String,String>> order_goods_info = new ArrayList<>(); | |||||
| for (CreateOrderCallback.Good good:createOrderCallback.getGoods()) { | |||||
| Map<String,String> map_info = new HashMap<>(); | |||||
| map_info.put("goods_id",good.getGoodsId()); | |||||
| map_info.put("merchant_uid","71228500084451433283"); | |||||
| order_goods_info.add(map_info); | |||||
| } | |||||
| data.put("order_goods_info",order_goods_info); | |||||