|
|
|
@@ -250,10 +250,10 @@ public class WxOrderController extends BaseController { |
|
|
|
data.put("out_order_no",order.getMainOrderId().toString()); |
|
|
|
data.put("order_entry_schema",wxOrderService.getOrderEntrySchema(order.getMainOrderId())); |
|
|
|
List<Map<String,Object>> goodsValid = new ArrayList<>(); |
|
|
|
for (Long goodId:order.getCouponChannelMap().keySet()) { |
|
|
|
for (Long couponChannelId:order.getCouponChannelMap().keySet()) { |
|
|
|
Map<String,Object> goodsValidMap = new HashMap<>(); |
|
|
|
goodsValidMap.put("goods_id",goodId.toString()); |
|
|
|
WxCouponChannel couponChannel = order.getCouponChannelMap().get(goodId); |
|
|
|
WxCouponChannel couponChannel = order.getCouponChannelMap().get(couponChannelId); |
|
|
|
goodsValidMap.put("goods_id",couponChannel.getTtSpuId()); |
|
|
|
WxCoupon wxCoupon = order.getCouponMap().get(couponChannel.getCouponId()); |
|
|
|
if(EnumCouponValidType.BETWEEN_TWO_TIME.getCode().equals(wxCoupon.getValidType())){ |
|
|
|
goodsValidMap.put("valid_start_time",wxCoupon.getValidStartDate().getTime()); |
|
|
|
|