From 302af584149c6f9e368f5050ccd5a7e87a604840 Mon Sep 17 00:00:00 2001 From: xhxu Date: Thu, 16 Jun 2022 10:02:30 +0800 Subject: [PATCH] //tt product --- .../controller/WxOrderController.java | 30 +++++++++---------- .../douyin/payv2/result/BaseTtPayResult.java | 2 -- 2 files changed, 15 insertions(+), 17 deletions(-) diff --git a/mallinkCApi/src/main/java/com/iformall/controller/WxOrderController.java b/mallinkCApi/src/main/java/com/iformall/controller/WxOrderController.java index 756a6e378..4c9de54eb 100644 --- a/mallinkCApi/src/main/java/com/iformall/controller/WxOrderController.java +++ b/mallinkCApi/src/main/java/com/iformall/controller/WxOrderController.java @@ -251,21 +251,21 @@ public class WxOrderController extends BaseController { data.put("out_order_no",order.getMainOrderId().toString()); // data.put("pay_expire_seconds",300); data.put("order_entry_schema",wxOrderService.getOrderEntrySchema(order.getMainOrderId())); - List> goodsValid = new ArrayList<>(); - for (Long couponChannelId:order.getCouponChannelMap().keySet()) { - Map goodsValidMap = new HashMap<>(); - 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()); - goodsValidMap.put("valid_end_time",wxCoupon.getValidEndDate().getTime()); - }else{ - goodsValidMap.put("valid_duration",(long)wxCoupon.getValidDays()*24*3600*1000); - } - goodsValid.add(goodsValidMap); - } - data.put("order_valid_time",goodsValid); +// List> goodsValid = new ArrayList<>(); +// for (Long couponChannelId:order.getCouponChannelMap().keySet()) { +// Map goodsValidMap = new HashMap<>(); +// 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()); +// goodsValidMap.put("valid_end_time",wxCoupon.getValidEndDate().getTime()); +// }else{ +// goodsValidMap.put("valid_duration",(long)wxCoupon.getValidDays()*24*3600*1000); +// } +// goodsValid.add(goodsValidMap); +// } +// data.put("order_valid_time",goodsValid); map.put("data",data); map.put("err_no",0); diff --git a/mallinkService/src/main/java/com/iformall/douyin/payv2/result/BaseTtPayResult.java b/mallinkService/src/main/java/com/iformall/douyin/payv2/result/BaseTtPayResult.java index 06ed10e24..ecb3395a3 100644 --- a/mallinkService/src/main/java/com/iformall/douyin/payv2/result/BaseTtPayResult.java +++ b/mallinkService/src/main/java/com/iformall/douyin/payv2/result/BaseTtPayResult.java @@ -4,8 +4,6 @@ import com.google.gson.annotations.SerializedName; import lombok.Data; import lombok.NoArgsConstructor; import me.chanjar.weixin.common.util.json.WxGsonBuilder; -import org.apache.commons.lang3.StringUtils; -import org.apache.poi.ss.formula.functions.T; import org.slf4j.Logger; import org.slf4j.LoggerFactory;