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

update push

release_toaliyun_real
xhxu 4 лет назад
Родитель
Сommit
52a8e54d30
3 измененных файлов: 4 добавлений и 1 удалений
  1. +1
    -0
      mallinkService/src/main/java/com/iformall/douyin/pay/DouYinPayHelper.java
  2. +2
    -0
      mallinkService/src/main/java/com/iformall/douyin/pay/preOrder/CreatePreOrderResult.java
  3. +1
    -1
      mallinkService/src/main/resources/mapper/WxOrderMapper.xml

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

@@ -131,6 +131,7 @@ public class DouYinPayHelper {
if (null != code && code.intValue() == 0 ) { if (null != code && code.intValue() == 0 ) {
CreatePreOrderResult result = new CreatePreOrderResult(); CreatePreOrderResult result = new CreatePreOrderResult();
result.setSuccess(true); result.setSuccess(true);
result.setOutOrderNo(preOrder.getOutOrderNo());
JSONObject data = jsonObject.getJSONObject("data"); JSONObject data = jsonObject.getJSONObject("data");
if (null != data ) { if (null != data ) {
result.setOrderId(data.getString("order_id")); result.setOrderId(data.getString("order_id"));


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

@@ -10,4 +10,6 @@ public class CreatePreOrderResult {
private String orderId; private String orderId;
private String token; private String token;


private String outOrderNo;

} }

+ 1
- 1
mallinkService/src/main/resources/mapper/WxOrderMapper.xml Просмотреть файл

@@ -454,7 +454,7 @@


<sql id="allCUserOrderListColumns"> <sql id="allCUserOrderListColumns">
o.id,o.order_number,o.tenant_id,o.parent_tenant_id,o.c_user_id,o.coupon_channel_id,o.product_id,o.payment_type,o.payment,o.payment_time,o.order_status,o.create_date,o.update_date, o.id,o.order_number,o.tenant_id,o.parent_tenant_id,o.c_user_id,o.coupon_channel_id,o.product_id,o.payment_type,o.payment,o.payment_time,o.order_status,o.create_date,o.update_date,
c.type,c.pay_vendor,c.cover_img,c.title,c.sub_title,c.sale_price,c.use_price,c.price,c.tail_price,c.orig_price,c.unit,c.valid_start_date,c.valid_end_date,c.pick_start_date,c.pick_end_date,
c.type,c.cover_img,c.title,c.sub_title,c.sale_price,c.use_price,c.price,c.tail_price,c.orig_price,c.unit,c.valid_start_date,c.valid_end_date,c.pick_start_date,c.pick_end_date,
o.compose_order_type,o.compose_order_id, o.compose_order_type,o.compose_order_id,
o.`coupon_number`,o.`freight_price`,o.`shipping_type`,o.`shipping_address`,o.parent_order_id o.`coupon_number`,o.`freight_price`,o.`shipping_type`,o.`shipping_address`,o.parent_order_id
</sql> </sql>


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