|
|
@@ -76,7 +76,7 @@ public class FmInsideOrderPushDeliveryMsgServiceImpl implements MsgSendService { |
|
|
if(EnumCouponOrderStatus.COUPON_ORDER_USED.getCode().equals(couponOrder.getCouponOrderStatus()) |
|
|
if(EnumCouponOrderStatus.COUPON_ORDER_USED.getCode().equals(couponOrder.getCouponOrderStatus()) |
|
|
&& EnumPayWay.PAY_WAY_TT.getCode().equals(couponOrder.getPayVendor())){ |
|
|
&& EnumPayWay.PAY_WAY_TT.getCode().equals(couponOrder.getPayVendor())){ |
|
|
WxOrder order = wxOrderService.getById(couponOrder.getOrderId(), tenantEntity.getTenantId()); |
|
|
WxOrder order = wxOrderService.getById(couponOrder.getOrderId(), tenantEntity.getTenantId()); |
|
|
String item_order_id = (String) order.getExpParamValue("item_order_id"); |
|
|
|
|
|
|
|
|
String itemOrderId = (String) order.getExpParamValue("itemOrderId"); |
|
|
WxMerchant merchant = wxMerchantService.getById(couponOrder.getBMerchantId()); |
|
|
WxMerchant merchant = wxMerchantService.getById(couponOrder.getBMerchantId()); |
|
|
String shop_name = merchant.getName(); |
|
|
String shop_name = merchant.getName(); |
|
|
String ext_valid_shop_id = couponOrder.getBMerchantId().toString(); |
|
|
String ext_valid_shop_id = couponOrder.getBMerchantId().toString(); |
|
|
@@ -91,7 +91,7 @@ public class FmInsideOrderPushDeliveryMsgServiceImpl implements MsgSendService { |
|
|
TtOrderPushDeliveryRequest request = new TtOrderPushDeliveryRequest(); |
|
|
TtOrderPushDeliveryRequest request = new TtOrderPushDeliveryRequest(); |
|
|
List<TtOrderPushDeliveryRequest.ItemOrder> itemOrderList = new ArrayList<>(); |
|
|
List<TtOrderPushDeliveryRequest.ItemOrder> itemOrderList = new ArrayList<>(); |
|
|
TtOrderPushDeliveryRequest.ItemOrder itemOrder = new TtOrderPushDeliveryRequest.ItemOrder(); |
|
|
TtOrderPushDeliveryRequest.ItemOrder itemOrder = new TtOrderPushDeliveryRequest.ItemOrder(); |
|
|
itemOrder.setItemOrderId(item_order_id); |
|
|
|
|
|
|
|
|
itemOrder.setItemOrderId(itemOrderId); |
|
|
itemOrderList.add(itemOrder); |
|
|
itemOrderList.add(itemOrder); |
|
|
request.setItemOrderList(itemOrderList); |
|
|
request.setItemOrderList(itemOrderList); |
|
|
JSONObject poiInfo = new JSONObject(); |
|
|
JSONObject poiInfo = new JSONObject(); |
|
|
|