Просмотр исходного кода

Merge branch 'release_toaliyun_real_push_order' of https://git.malls.iformall.com/server/formallProject into release_toaliyun_real_push_order

release_toaliyun_real
lin 3 лет назад
Родитель
Сommit
8e19eaf9b4
3 измененных файлов: 5 добавлений и 5 удалений
  1. +1
    -1
      mallinkService/src/main/java/com/iformall/douyin/payv2/auth/TtPayCredentials.java
  2. +2
    -2
      mallinkService/src/main/java/com/iformall/service/msg/impl/FmInsideOrderPushDeliveryMsgServiceImpl.java
  3. +2
    -2
      mallinkService/src/main/java/com/iformall/service/pay/service/refund/douyin/TtRefundAdapterService.java

+ 1
- 1
mallinkService/src/main/java/com/iformall/douyin/payv2/auth/TtPayCredentials.java Просмотреть файл

@@ -79,7 +79,7 @@ public class TtPayCredentials implements Credentials {

String body = "";
// PATCH,POST,PUT
body = EntityUtils.toString(((HttpEntityEnclosingRequest) request).getEntity());
body = EntityUtils.toString(((HttpEntityEnclosingRequest) request).getEntity(),StandardCharsets.UTF_8);

return request.getRequestLine().getMethod() + "\n"
+ canonicalUrl + "\n"


+ 2
- 2
mallinkService/src/main/java/com/iformall/service/msg/impl/FmInsideOrderPushDeliveryMsgServiceImpl.java Просмотреть файл

@@ -76,7 +76,7 @@ public class FmInsideOrderPushDeliveryMsgServiceImpl implements MsgSendService {
if(EnumCouponOrderStatus.COUPON_ORDER_USED.getCode().equals(couponOrder.getCouponOrderStatus())
&& EnumPayWay.PAY_WAY_TT.getCode().equals(couponOrder.getPayVendor())){
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());
String shop_name = merchant.getName();
String ext_valid_shop_id = couponOrder.getBMerchantId().toString();
@@ -91,7 +91,7 @@ public class FmInsideOrderPushDeliveryMsgServiceImpl implements MsgSendService {
TtOrderPushDeliveryRequest request = new TtOrderPushDeliveryRequest();
List<TtOrderPushDeliveryRequest.ItemOrder> itemOrderList = new ArrayList<>();
TtOrderPushDeliveryRequest.ItemOrder itemOrder = new TtOrderPushDeliveryRequest.ItemOrder();
itemOrder.setItemOrderId(item_order_id);
itemOrder.setItemOrderId(itemOrderId);
itemOrderList.add(itemOrder);
request.setItemOrderList(itemOrderList);
JSONObject poiInfo = new JSONObject();


+ 2
- 2
mallinkService/src/main/java/com/iformall/service/pay/service/refund/douyin/TtRefundAdapterService.java Просмотреть файл

@@ -65,8 +65,8 @@ public class TtRefundAdapterService implements RefundPayAdapterService{
}else{
List<TtPayRefundV2Request.OrderDetail> list = new ArrayList<>();
TtPayRefundV2Request.OrderDetail orderDetail = new TtPayRefundV2Request.OrderDetail();
String refund_total_amount = (String) order.getExpParamValue("refund_total_amount");
orderDetail.setItemOrderId(refund_total_amount);
String itemOrderId = (String) order.getExpParamValue("itemOrderId");
orderDetail.setItemOrderId(itemOrderId);
list.add(orderDetail);
request.setItemOrderDetail(list);
}


Загрузка…
Отмена
Сохранить