From b5e9de29cb94b4f654573060146285d55c04f17e Mon Sep 17 00:00:00 2001 From: xhxu Date: Wed, 11 May 2022 15:42:03 +0800 Subject: [PATCH] //update push --- .../douyin/miniApp/TtMiniAppPayAdapterService.java | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/mallinkService/src/main/java/com/iformall/service/pay/service/pay/douyin/miniApp/TtMiniAppPayAdapterService.java b/mallinkService/src/main/java/com/iformall/service/pay/service/pay/douyin/miniApp/TtMiniAppPayAdapterService.java index 52296242a..28c2e97e6 100644 --- a/mallinkService/src/main/java/com/iformall/service/pay/service/pay/douyin/miniApp/TtMiniAppPayAdapterService.java +++ b/mallinkService/src/main/java/com/iformall/service/pay/service/pay/douyin/miniApp/TtMiniAppPayAdapterService.java @@ -4,6 +4,7 @@ import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.iformall.domain.po.*; +import com.iformall.domain.vo.WxMerchantVo; import com.iformall.domain.vo.WxOrderCouponVo; import com.iformall.douyin.miniapp.api.TtMaService; import com.iformall.douyin.pay.DouYinPayHelper; @@ -29,6 +30,8 @@ import org.springframework.stereotype.Service; import java.io.File; import java.util.*; +import static java.util.stream.Collectors.toList; + @Slf4j @Service public class TtMiniAppPayAdapterService extends BaseTtPayAdapterService implements CDrivingPayService{ @@ -117,6 +120,7 @@ public class TtMiniAppPayAdapterService extends BaseTtPayAdapterService implemen } //目前订单都是一笔一笔同步,暂不支持购物车 WxOrderCouponVo wxOrderCouponVo = batchOrder.getOrders().get(0); + List merchantList = wxOrderCouponVo.getMerchantVoList().stream().sorted(Comparator.comparing(m -> m.getTtPoi(), Comparator.nullsLast(String::compareTo))).collect(toList()); TtMaService ttappService = maUtil.getTtMaService(appInfo); // map.put("access_token",appInfo.getAccessToken());//后面会自动加上 @@ -126,7 +130,7 @@ public class TtMiniAppPayAdapterService extends BaseTtPayAdapterService implemen map.put("payment_order_no", payOrder.getTransactionId()); if(isPoiOrder){ map.put("client_key",clientKey);//第三方在开放平台申请的 ClientKey(生活服务订单必传) - map.put("ext_shop_id",wxOrderCouponVo.getMerchantVoList().get(0).getId());//生活服务外部商户 id,购买店铺 id (生活服务订单必传) + map.put("ext_shop_id",merchantList.get(0).getId().toString());//生活服务外部商户 id,购买店铺 id (生活服务订单必传) map.put("order_type",9101); }else{ map.put("order_type",0); @@ -142,7 +146,7 @@ public class TtMiniAppPayAdapterService extends BaseTtPayAdapterService implemen if(isPoiOrder){ orderDetail.put("ext_order_id",payOrder.getPayOrderNo()); orderDetail.put("status", getTtPoiOrderStatus(wxOrderCouponVo.getOrderStatus(),wxOrderCouponVo.getCouponOrderStatus()).getCode()); - orderDetail.put("shop_name",wxOrderCouponVo.getMerchantVoList().get(0).getMerchantName()); + orderDetail.put("shop_name",merchantList.get(0).getMerchantName()); orderDetail.put("entry_type",2); orderDetail.put("entry_schema",getOrderEntrySchema(appInfo.getAppId(),batchOrder.getId())); orderDetail.put("create_order_time",batchOrder.getCreateDate().getTime()); @@ -153,13 +157,13 @@ public class TtMiniAppPayAdapterService extends BaseTtPayAdapterService implemen } if(EnumCouponOrderStatus.COUPON_ORDER_USED.getCode().equals(wxOrderCouponVo.getCouponOrderStatus()) && wxOrderCouponVo.getBMerchantId() != null){ - orderDetail.put("ext_valid_shop_id",wxOrderCouponVo.getBMerchantId()); + orderDetail.put("ext_valid_shop_id",wxOrderCouponVo.getBMerchantId().toString()); TtMerchantPoi merchantPoi = ttMerchantPoiMapper.selectById(wxOrderCouponVo.getBMerchantId()); if(merchantPoi != null){ orderDetail.put("valid_poi_id_str",merchantPoi.getPoiId()); } } - orderDetail.put("ext_goods_id",wxOrderCouponVo.getCouponChannelId()); + orderDetail.put("ext_goods_id",wxOrderCouponVo.getCouponChannelId().toString()); orderDetail.put("goods_name",wxOrderCouponVo.getTitle()); // orderDetail.put("goods_info","");//商品描述信息。向用户介绍商品,最多120字。 orderDetail.put("goods_cover_image",wxOrderCouponVo.getCoverImg());