|
|
|
@@ -1,6 +1,7 @@ |
|
|
|
package com.iformall.utils.car; |
|
|
|
|
|
|
|
import com.alibaba.fastjson.JSON; |
|
|
|
import com.alibaba.fastjson.JSONArray; |
|
|
|
import com.alibaba.fastjson.JSONObject; |
|
|
|
import com.iformall.domain.po.WxCoupon; |
|
|
|
import com.iformall.domain.po.WxCouponOrder; |
|
|
|
@@ -385,22 +386,24 @@ public class TJDUtil { |
|
|
|
paramMap.put(TJD_ACCOUNT_ID, accountId); |
|
|
|
paramMap.put(TJD_PREPAY_TYPE, TJD_PREPAY_TYPE_3); |
|
|
|
|
|
|
|
Map<String, String> detailMap = MapUtil.getOrderMap(); |
|
|
|
detailMap.put(TJD_OUT_TRADE_NO, String.valueOf(couponOrder.getId())); |
|
|
|
detailMap.put(TJD_TYPE, TJD_TYPE_COUPON); |
|
|
|
detailMap.put(TJD_CHANNEL, "2204"); |
|
|
|
JSONArray detailArr = new JSONArray(); |
|
|
|
JSONObject detailObj = new JSONObject(); |
|
|
|
detailObj.put(TJD_OUT_TRADE_NO, String.valueOf(couponOrder.getId())); |
|
|
|
detailObj.put(TJD_TYPE, TJD_TYPE_COUPON); |
|
|
|
detailObj.put(TJD_CHANNEL, "2204"); |
|
|
|
String memo = "会员优惠券"; |
|
|
|
if (coupon.getUnit().equals(0)) { |
|
|
|
detailMap.put(TJD_COUPON_TYPE, "0"); |
|
|
|
detailMap.put(TJD_AMOUNT, coupon.getPriceStr()); |
|
|
|
detailObj.put(TJD_COUPON_TYPE, "0"); |
|
|
|
detailObj.put(TJD_AMOUNT, coupon.getPriceStr()); |
|
|
|
memo += "-金额"; |
|
|
|
} else { |
|
|
|
detailMap.put(TJD_COUPON_TYPE, "1"); |
|
|
|
detailMap.put(TJD_MINUTES, String.valueOf(coupon.getPrice()*60)); |
|
|
|
detailObj.put(TJD_COUPON_TYPE, "1"); |
|
|
|
detailObj.put(TJD_MINUTES, String.valueOf(coupon.getPrice()*60)); |
|
|
|
memo += "-时长"; |
|
|
|
} |
|
|
|
detailMap.put(TJD_MEMO, memo); |
|
|
|
paramMap.put(TJD_DETAIL_LIST, JSON.toJSONString(detailMap)); |
|
|
|
detailObj.put(TJD_MEMO, memo); |
|
|
|
detailArr.add(detailObj); |
|
|
|
paramMap.put(TJD_DETAIL_LIST, JSON.toJSONString(detailArr)); |
|
|
|
|
|
|
|
paramMap.put(TJD_CHARSET, TJD_UTF_8); |
|
|
|
paramMap.put(TJD_ACCOUNT, partner); |
|
|
|
|