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

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

release_toaliyun_real
winter 4 лет назад
Родитель
Сommit
047512df71
17 измененных файлов: 262 добавлений и 13 удалений
  1. +205
    -0
      mallinkAdmin/src/main/resources/db/migration/V2022042600002__refund.sql
  2. +5
    -0
      mallinkAdmin/src/main/resources/db/migration/V2022042700001__addmenu.sql
  3. +7
    -2
      mallinkCApi/src/main/java/com/iformall/controller/WxOrderController.java
  4. +3
    -0
      mallinkService/src/main/java/com/iformall/domain/po/WxPayOrder.java
  5. +2
    -0
      mallinkService/src/main/java/com/iformall/domain/po/WxRefundOrder.java
  6. +3
    -0
      mallinkService/src/main/java/com/iformall/douyin/pay/orderQuery/OrderQueryResult.java
  7. +11
    -0
      mallinkService/src/main/java/com/iformall/enums/EnumOrderStatus.java
  8. +0
    -2
      mallinkService/src/main/java/com/iformall/service/WxProfitSharingReceiverService.java
  9. +1
    -0
      mallinkService/src/main/java/com/iformall/service/impl/WxPayOrderServiceImpl.java
  10. +1
    -0
      mallinkService/src/main/java/com/iformall/service/impl/WxRefundOrderServiceImpl.java
  11. +3
    -3
      mallinkService/src/main/java/com/iformall/service/pay/PayServiceFactory.java
  12. +1
    -1
      mallinkService/src/main/java/com/iformall/service/pay/service/pay/douyin/BaseTtPayAdapterService.java
  13. +4
    -1
      mallinkService/src/main/java/com/iformall/service/pay/service/pay/entity/PayQueryAdapterResult.java
  14. +1
    -1
      mallinkService/src/main/java/com/iformall/service/pay/service/pay/wx/BaseWxPayAdapterService.java
  15. +7
    -1
      mallinkService/src/main/resources/mapper/WxOrderMapper.xml
  16. +6
    -1
      mallinkService/src/main/resources/mapper/WxPayOrderMapper.xml
  17. +2
    -1
      mallinkService/src/main/resources/mapper/WxRefundOrderMapper.xml

+ 205
- 0
mallinkAdmin/src/main/resources/db/migration/V2022042600002__refund.sql Просмотреть файл

@@ -0,0 +1,205 @@
ALTER TABLE `mallink`.`wx_pay_order_0`
ADD COLUMN `tt_pay_way` smallint(2) AFTER `pay_from`;
ALTER TABLE `mallink`.`wx_pay_order_1`
ADD COLUMN `tt_pay_way` smallint(2) AFTER `pay_from`;
ALTER TABLE `mallink`.`wx_pay_order_2`
ADD COLUMN `tt_pay_way` smallint(2) AFTER `pay_from`;
ALTER TABLE `mallink`.`wx_pay_order_3`
ADD COLUMN `tt_pay_way` smallint(2) AFTER `pay_from`;
ALTER TABLE `mallink`.`wx_pay_order_4`
ADD COLUMN `tt_pay_way` smallint(2) AFTER `pay_from`;
ALTER TABLE `mallink`.`wx_pay_order_5`
ADD COLUMN `tt_pay_way` smallint(2) AFTER `pay_from`;
ALTER TABLE `mallink`.`wx_pay_order_6`
ADD COLUMN `tt_pay_way` smallint(2) AFTER `pay_from`;
ALTER TABLE `mallink`.`wx_pay_order_7`
ADD COLUMN `tt_pay_way` smallint(2) AFTER `pay_from`;
ALTER TABLE `mallink`.`wx_pay_order_8`
ADD COLUMN `tt_pay_way` smallint(2) AFTER `pay_from`;
ALTER TABLE `mallink`.`wx_pay_order_9`
ADD COLUMN `tt_pay_way` smallint(2) AFTER `pay_from`;
ALTER TABLE `mallink`.`wx_pay_order_10`
ADD COLUMN `tt_pay_way` smallint(2) AFTER `pay_from`;
ALTER TABLE `mallink`.`wx_pay_order_11`
ADD COLUMN `tt_pay_way` smallint(2) AFTER `pay_from`;
ALTER TABLE `mallink`.`wx_pay_order_12`
ADD COLUMN `tt_pay_way` smallint(2) AFTER `pay_from`;
ALTER TABLE `mallink`.`wx_pay_order_13`
ADD COLUMN `tt_pay_way` smallint(2) AFTER `pay_from`;
ALTER TABLE `mallink`.`wx_pay_order_14`
ADD COLUMN `tt_pay_way` smallint(2) AFTER `pay_from`;
ALTER TABLE `mallink`.`wx_pay_order_15`
ADD COLUMN `tt_pay_way` smallint(2) AFTER `pay_from`;
ALTER TABLE `mallink`.`wx_pay_order_16`
ADD COLUMN `tt_pay_way` smallint(2) AFTER `pay_from`;
ALTER TABLE `mallink`.`wx_pay_order_17`
ADD COLUMN `tt_pay_way` smallint(2) AFTER `pay_from`;
ALTER TABLE `mallink`.`wx_pay_order_18`
ADD COLUMN `tt_pay_way` smallint(2) AFTER `pay_from`;
ALTER TABLE `mallink`.`wx_pay_order_19`
ADD COLUMN `tt_pay_way` smallint(2) AFTER `pay_from`;
ALTER TABLE `mallink`.`wx_pay_order_20`
ADD COLUMN `tt_pay_way` smallint(2) AFTER `pay_from`;
ALTER TABLE `mallink`.`wx_pay_order_21`
ADD COLUMN `tt_pay_way` smallint(2) AFTER `pay_from`;
ALTER TABLE `mallink`.`wx_pay_order_22`
ADD COLUMN `tt_pay_way` smallint(2) AFTER `pay_from`;
ALTER TABLE `mallink`.`wx_pay_order_23`
ADD COLUMN `tt_pay_way` smallint(2) AFTER `pay_from`;
ALTER TABLE `mallink`.`wx_pay_order_24`
ADD COLUMN `tt_pay_way` smallint(2) AFTER `pay_from`;
ALTER TABLE `mallink`.`wx_pay_order_25`
ADD COLUMN `tt_pay_way` smallint(2) AFTER `pay_from`;
ALTER TABLE `mallink`.`wx_pay_order_26`
ADD COLUMN `tt_pay_way` smallint(2) AFTER `pay_from`;
ALTER TABLE `mallink`.`wx_pay_order_27`
ADD COLUMN `tt_pay_way` smallint(2) AFTER `pay_from`;
ALTER TABLE `mallink`.`wx_pay_order_28`
ADD COLUMN `tt_pay_way` smallint(2) AFTER `pay_from`;
ALTER TABLE `mallink`.`wx_pay_order_29`
ADD COLUMN `tt_pay_way` smallint(2) AFTER `pay_from`;
ALTER TABLE `mallink`.`wx_pay_order_30`
ADD COLUMN `tt_pay_way` smallint(2) AFTER `pay_from`;
ALTER TABLE `mallink`.`wx_pay_order_31`
ADD COLUMN `tt_pay_way` smallint(2) AFTER `pay_from`;
ALTER TABLE `mallink`.`wx_pay_order_32`
ADD COLUMN `tt_pay_way` smallint(2) AFTER `pay_from`;
ALTER TABLE `mallink`.`wx_pay_order_33`
ADD COLUMN `tt_pay_way` smallint(2) AFTER `pay_from`;
ALTER TABLE `mallink`.`wx_pay_order_34`
ADD COLUMN `tt_pay_way` smallint(2) AFTER `pay_from`;
ALTER TABLE `mallink`.`wx_pay_order_35`
ADD COLUMN `tt_pay_way` smallint(2) AFTER `pay_from`;
ALTER TABLE `mallink`.`wx_pay_order_36`
ADD COLUMN `tt_pay_way` smallint(2) AFTER `pay_from`;
ALTER TABLE `mallink`.`wx_pay_order_37`
ADD COLUMN `tt_pay_way` smallint(2) AFTER `pay_from`;
ALTER TABLE `mallink`.`wx_pay_order_38`
ADD COLUMN `tt_pay_way` smallint(2) AFTER `pay_from`;
ALTER TABLE `mallink`.`wx_pay_order_39`
ADD COLUMN `tt_pay_way` smallint(2) AFTER `pay_from`;
ALTER TABLE `mallink`.`wx_pay_order_40`
ADD COLUMN `tt_pay_way` smallint(2) AFTER `pay_from`;
ALTER TABLE `mallink`.`wx_pay_order_41`
ADD COLUMN `tt_pay_way` smallint(2) AFTER `pay_from`;
ALTER TABLE `mallink`.`wx_pay_order_42`
ADD COLUMN `tt_pay_way` smallint(2) AFTER `pay_from`;
ALTER TABLE `mallink`.`wx_pay_order_43`
ADD COLUMN `tt_pay_way` smallint(2) AFTER `pay_from`;
ALTER TABLE `mallink`.`wx_pay_order_44`
ADD COLUMN `tt_pay_way` smallint(2) AFTER `pay_from`;
ALTER TABLE `mallink`.`wx_pay_order_45`
ADD COLUMN `tt_pay_way` smallint(2) AFTER `pay_from`;
ALTER TABLE `mallink`.`wx_pay_order_46`
ADD COLUMN `tt_pay_way` smallint(2) AFTER `pay_from`;
ALTER TABLE `mallink`.`wx_pay_order_47`
ADD COLUMN `tt_pay_way` smallint(2) AFTER `pay_from`;
ALTER TABLE `mallink`.`wx_pay_order_48`
ADD COLUMN `tt_pay_way` smallint(2) AFTER `pay_from`;
ALTER TABLE `mallink`.`wx_pay_order_49`
ADD COLUMN `tt_pay_way` smallint(2) AFTER `pay_from`;
ALTER TABLE `mallink`.`wx_pay_order_50`
ADD COLUMN `tt_pay_way` smallint(2) AFTER `pay_from`;
ALTER TABLE `mallink`.`wx_pay_order_51`
ADD COLUMN `tt_pay_way` smallint(2) AFTER `pay_from`;
ALTER TABLE `mallink`.`wx_pay_order_52`
ADD COLUMN `tt_pay_way` smallint(2) AFTER `pay_from`;
ALTER TABLE `mallink`.`wx_pay_order_53`
ADD COLUMN `tt_pay_way` smallint(2) AFTER `pay_from`;
ALTER TABLE `mallink`.`wx_pay_order_54`
ADD COLUMN `tt_pay_way` smallint(2) AFTER `pay_from`;
ALTER TABLE `mallink`.`wx_pay_order_55`
ADD COLUMN `tt_pay_way` smallint(2) AFTER `pay_from`;
ALTER TABLE `mallink`.`wx_pay_order_56`
ADD COLUMN `tt_pay_way` smallint(2) AFTER `pay_from`;
ALTER TABLE `mallink`.`wx_pay_order_57`
ADD COLUMN `tt_pay_way` smallint(2) AFTER `pay_from`;
ALTER TABLE `mallink`.`wx_pay_order_58`
ADD COLUMN `tt_pay_way` smallint(2) AFTER `pay_from`;
ALTER TABLE `mallink`.`wx_pay_order_59`
ADD COLUMN `tt_pay_way` smallint(2) AFTER `pay_from`;
ALTER TABLE `mallink`.`wx_pay_order_60`
ADD COLUMN `tt_pay_way` smallint(2) AFTER `pay_from`;
ALTER TABLE `mallink`.`wx_pay_order_61`
ADD COLUMN `tt_pay_way` smallint(2) AFTER `pay_from`;
ALTER TABLE `mallink`.`wx_pay_order_62`
ADD COLUMN `tt_pay_way` smallint(2) AFTER `pay_from`;
ALTER TABLE `mallink`.`wx_pay_order_63`
ADD COLUMN `tt_pay_way` smallint(2) AFTER `pay_from`;
ALTER TABLE `mallink`.`wx_pay_order_64`
ADD COLUMN `tt_pay_way` smallint(2) AFTER `pay_from`;
ALTER TABLE `mallink`.`wx_pay_order_65`
ADD COLUMN `tt_pay_way` smallint(2) AFTER `pay_from`;
ALTER TABLE `mallink`.`wx_pay_order_66`
ADD COLUMN `tt_pay_way` smallint(2) AFTER `pay_from`;
ALTER TABLE `mallink`.`wx_pay_order_67`
ADD COLUMN `tt_pay_way` smallint(2) AFTER `pay_from`;
ALTER TABLE `mallink`.`wx_pay_order_68`
ADD COLUMN `tt_pay_way` smallint(2) AFTER `pay_from`;
ALTER TABLE `mallink`.`wx_pay_order_69`
ADD COLUMN `tt_pay_way` smallint(2) AFTER `pay_from`;
ALTER TABLE `mallink`.`wx_pay_order_70`
ADD COLUMN `tt_pay_way` smallint(2) AFTER `pay_from`;
ALTER TABLE `mallink`.`wx_pay_order_71`
ADD COLUMN `tt_pay_way` smallint(2) AFTER `pay_from`;
ALTER TABLE `mallink`.`wx_pay_order_72`
ADD COLUMN `tt_pay_way` smallint(2) AFTER `pay_from`;
ALTER TABLE `mallink`.`wx_pay_order_73`
ADD COLUMN `tt_pay_way` smallint(2) AFTER `pay_from`;
ALTER TABLE `mallink`.`wx_pay_order_74`
ADD COLUMN `tt_pay_way` smallint(2) AFTER `pay_from`;
ALTER TABLE `mallink`.`wx_pay_order_75`
ADD COLUMN `tt_pay_way` smallint(2) AFTER `pay_from`;
ALTER TABLE `mallink`.`wx_pay_order_76`
ADD COLUMN `tt_pay_way` smallint(2) AFTER `pay_from`;
ALTER TABLE `mallink`.`wx_pay_order_77`
ADD COLUMN `tt_pay_way` smallint(2) AFTER `pay_from`;
ALTER TABLE `mallink`.`wx_pay_order_78`
ADD COLUMN `tt_pay_way` smallint(2) AFTER `pay_from`;
ALTER TABLE `mallink`.`wx_pay_order_79`
ADD COLUMN `tt_pay_way` smallint(2) AFTER `pay_from`;
ALTER TABLE `mallink`.`wx_pay_order_80`
ADD COLUMN `tt_pay_way` smallint(2) AFTER `pay_from`;
ALTER TABLE `mallink`.`wx_pay_order_81`
ADD COLUMN `tt_pay_way` smallint(2) AFTER `pay_from`;
ALTER TABLE `mallink`.`wx_pay_order_82`
ADD COLUMN `tt_pay_way` smallint(2) AFTER `pay_from`;
ALTER TABLE `mallink`.`wx_pay_order_83`
ADD COLUMN `tt_pay_way` smallint(2) AFTER `pay_from`;
ALTER TABLE `mallink`.`wx_pay_order_84`
ADD COLUMN `tt_pay_way` smallint(2) AFTER `pay_from`;
ALTER TABLE `mallink`.`wx_pay_order_85`
ADD COLUMN `tt_pay_way` smallint(2) AFTER `pay_from`;
ALTER TABLE `mallink`.`wx_pay_order_86`
ADD COLUMN `tt_pay_way` smallint(2) AFTER `pay_from`;
ALTER TABLE `mallink`.`wx_pay_order_87`
ADD COLUMN `tt_pay_way` smallint(2) AFTER `pay_from`;
ALTER TABLE `mallink`.`wx_pay_order_88`
ADD COLUMN `tt_pay_way` smallint(2) AFTER `pay_from`;
ALTER TABLE `mallink`.`wx_pay_order_89`
ADD COLUMN `tt_pay_way` smallint(2) AFTER `pay_from`;
ALTER TABLE `mallink`.`wx_pay_order_90`
ADD COLUMN `tt_pay_way` smallint(2) AFTER `pay_from`;
ALTER TABLE `mallink`.`wx_pay_order_91`
ADD COLUMN `tt_pay_way` smallint(2) AFTER `pay_from`;
ALTER TABLE `mallink`.`wx_pay_order_92`
ADD COLUMN `tt_pay_way` smallint(2) AFTER `pay_from`;
ALTER TABLE `mallink`.`wx_pay_order_93`
ADD COLUMN `tt_pay_way` smallint(2) AFTER `pay_from`;
ALTER TABLE `mallink`.`wx_pay_order_94`
ADD COLUMN `tt_pay_way` smallint(2) AFTER `pay_from`;
ALTER TABLE `mallink`.`wx_pay_order_95`
ADD COLUMN `tt_pay_way` smallint(2) AFTER `pay_from`;
ALTER TABLE `mallink`.`wx_pay_order_96`
ADD COLUMN `tt_pay_way` smallint(2) AFTER `pay_from`;
ALTER TABLE `mallink`.`wx_pay_order_97`
ADD COLUMN `tt_pay_way` smallint(2) AFTER `pay_from`;
ALTER TABLE `mallink`.`wx_pay_order_98`
ADD COLUMN `tt_pay_way` smallint(2) AFTER `pay_from`;
ALTER TABLE `mallink`.`wx_pay_order_99`
ADD COLUMN `tt_pay_way` smallint(2) AFTER `pay_from`;



ALTER TABLE `mallink`.`wx_refund_order`
ADD COLUMN `tt_pay_way` smallint(2) AFTER `pay_order_no`;

+ 5
- 0
mallinkAdmin/src/main/resources/db/migration/V2022042700001__addmenu.sql Просмотреть файл

@@ -0,0 +1,5 @@
INSERT INTO `mallink`.`mall_permission`(`id`, `name`, `parent_id`, `available`, `permission`, `resource_type`, `module_color`, `module_color_num`, `url`, `icon`, `version_type`, `sort`) VALUES (687, '直播投放', 606, 'Y', NULL, 1, NULL, NULL, 'live_telecast', NULL, 0, 687);


UPDATE `mallink`.`mall_sale_type` SET `menus` = '[1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 50, 101, 102, 103, 104, 105, 106, 107, 108, 109, 201, 202, 203, 204, 205, 206, 209, 211, 212, 221, 222, 251, 299, 300, 301, 302, 303, 304, 305, 306, 401, 402, 403, 404, 405, 406, 407, 408, 409, 410, 411, 412, 413, 414, 415, 416, 417, 418, 420, 421, 422, 501, 502, 503, 504, 505, 506, 507, 508, 509, 511, 512, 513, 514, 521, 522, 523, 531, 532, 533, 591, 592, 595, 601, 602, 603, 604, 605, 606, 607, 608, 609, 610, 611, 612, 613, 614, 621, 622, 623, 624, 625, 626, 627, 641, 642, 643, 644, 645, 646, 651, 661, 662, 663, 664, 665, 666, 671, 672, 673, 674, 675, 681, 682, 683, 684, 685, 686, 687, 691, 692, 693, 694, 695, 701, 702, 703, 704, 711, 712, 713, 714, 901, 902, 903, 904, 905, 906, 907, 908, 910, 931, 932, 951, 952, 961, 962, 963, 965, 966, 967, 968, 1001, 1002, 1003, 1004, 60701, 60702]' WHERE `id` = 1;


+ 7
- 2
mallinkCApi/src/main/java/com/iformall/controller/WxOrderController.java Просмотреть файл

@@ -564,6 +564,11 @@ public class WxOrderController extends BaseController {
} catch (Exception e) { } catch (Exception e) {
return new ResultData(Result.ERROR,e.getMessage()); return new ResultData(Result.ERROR,e.getMessage());
} }
if(wxOrder.getOrderStatus() != null && EnumOrderStatus.ORDER_STATUS_PENDING_REFUND.getCode().equals(wxOrder.getOrderStatus())){
wxOrder.setOrderStatus(null);
wxOrder.setStatusS(EnumOrderStatus.getRefundStatus());
}

wxOrder.setCUserId(memberId); wxOrder.setCUserId(memberId);
wxOrder.setSortColumns(BaseEntity.SortField.UpdateDate_DESC); wxOrder.setSortColumns(BaseEntity.SortField.UpdateDate_DESC);
wxOrder.updateTenantInfo(getTenantInfo()); wxOrder.updateTenantInfo(getTenantInfo());
@@ -616,8 +621,8 @@ public class WxOrderController extends BaseController {
return new ResultData(ErrorCode.ORDER_IS_NOT_FIND); return new ResultData(ErrorCode.ORDER_IS_NOT_FIND);
} }
if(!EnumOrderStatus.ORDER_STATUS_PENDING_REFUND.getCode().equals(wxOrder.getOrderStatus()) if(!EnumOrderStatus.ORDER_STATUS_PENDING_REFUND.getCode().equals(wxOrder.getOrderStatus())
|| !EnumOrderStatus.ORDER_STATUS_REFUND_SUCCESS.getCode().equals(wxOrder.getOrderStatus())
|| !EnumOrderStatus.ORDER_STATUS_REFUND_FAILD.getCode().equals(wxOrder.getOrderStatus())){
&& !EnumOrderStatus.ORDER_STATUS_REFUND_SUCCESS.getCode().equals(wxOrder.getOrderStatus())
&& !EnumOrderStatus.ORDER_STATUS_REFUND_FAILD.getCode().equals(wxOrder.getOrderStatus())){
logger.error("交易订单状态不是退款状态:" + EnumOrderStatus.getEnum(wxOrder.getOrderStatus()).getMessage()); logger.error("交易订单状态不是退款状态:" + EnumOrderStatus.getEnum(wxOrder.getOrderStatus()).getMessage());
return new ResultData(ErrorCode.ORDER_IS_NOT_FIND.getCode(),"订单不是退款状态"); return new ResultData(ErrorCode.ORDER_IS_NOT_FIND.getCode(),"订单不是退款状态");
} }


+ 3
- 0
mallinkService/src/main/java/com/iformall/domain/po/WxPayOrder.java Просмотреть файл

@@ -89,6 +89,9 @@ public class WxPayOrder extends TenantEntity {
@io.swagger.annotations.ApiModelProperty(value="支付后结果来源(0:inside, 1:POS支付)",name="payFrom") @io.swagger.annotations.ApiModelProperty(value="支付后结果来源(0:inside, 1:POS支付)",name="payFrom")
private Integer payFrom; private Integer payFrom;

@io.swagger.annotations.ApiModelProperty(value="抖音支付实际支付方式--1-微信支付,2-支付宝支付,10-抖音支付",name="ttPayWay")
private Integer ttPayWay;
@io.swagger.annotations.ApiModelProperty(value="支付订单号,来源于POS, inside时,填写couponOrderId",name="posPayOrderId") @io.swagger.annotations.ApiModelProperty(value="支付订单号,来源于POS, inside时,填写couponOrderId",name="posPayOrderId")
private Long posPayOrderId; private Long posPayOrderId;
@io.swagger.annotations.ApiModelProperty(value="支付订单创建时间,来源于POS",name="posPayOrderTime") @io.swagger.annotations.ApiModelProperty(value="支付订单创建时间,来源于POS",name="posPayOrderTime")


+ 2
- 0
mallinkService/src/main/java/com/iformall/domain/po/WxRefundOrder.java Просмотреть файл

@@ -38,6 +38,8 @@ public class WxRefundOrder extends TenantEntity {
private Date refundTimeEnd; private Date refundTimeEnd;
@io.swagger.annotations.ApiModelProperty(value="支付渠道: 0-微信 1-支付宝 2-银联 ",name="refundVendor") @io.swagger.annotations.ApiModelProperty(value="支付渠道: 0-微信 1-支付宝 2-银联 ",name="refundVendor")
private Integer refundVendor; private Integer refundVendor;
@io.swagger.annotations.ApiModelProperty(value="抖音支付实际支付方式--1-微信支付,2-支付宝支付,10-抖音支付",name="ttPayWay")
private Integer ttPayWay;
@io.swagger.annotations.ApiModelProperty(value="支付状态: 0-退款中;1-退款成功;2-退款失败",name="refundOrderStatus") @io.swagger.annotations.ApiModelProperty(value="支付状态: 0-退款中;1-退款成功;2-退款失败",name="refundOrderStatus")
private Integer refundOrderStatus; private Integer refundOrderStatus;
@io.swagger.annotations.ApiModelProperty(value="微信退款单号",name="refundId") @io.swagger.annotations.ApiModelProperty(value="微信退款单号",name="refundId")


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

@@ -8,6 +8,9 @@ public class OrderQueryResult {
private Integer totalFee; private Integer totalFee;
private String orderStatus;//"PROCESSING-处理中|SUCCESS-成功|FAIL-失败|TIMEOUT-超时" private String orderStatus;//"PROCESSING-处理中|SUCCESS-成功|FAIL-失败|TIMEOUT-超时"
private String payTime; private String payTime;
/**
* 1-微信支付,2-支付宝支付,10-抖音支付
*/
private Integer way; private Integer way;
private String channelNo; private String channelNo;
private String channelGatewayNo; private String channelGatewayNo;


+ 11
- 0
mallinkService/src/main/java/com/iformall/enums/EnumOrderStatus.java Просмотреть файл

@@ -1,5 +1,8 @@
package com.iformall.enums; package com.iformall.enums;


import java.util.ArrayList;
import java.util.List;

/** /**
* Created by Stormeye on 2018/08/09. * Created by Stormeye on 2018/08/09.
*/ */
@@ -52,4 +55,12 @@ public enum EnumOrderStatus {
public String getMessage() { public String getMessage() {
return message; return message;
} }

public static List<Integer> getRefundStatus(){
List<Integer> list = new ArrayList<>();
list.add(ORDER_STATUS_PENDING_REFUND.getCode());
list.add(ORDER_STATUS_REFUND_SUCCESS.getCode());
list.add(ORDER_STATUS_REFUND_FAILD.getCode());
return list;
}
} }

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

@@ -16,8 +16,6 @@ public interface WxProfitSharingReceiverService {
* 根据实体查询分页列表 * 根据实体查询分页列表
* *
* @param record * @param record
* @param offset
* @param limit
* @return * @return
*/ */
PageInfo<WxProfitSharingReceiver> listAsPage(WxProfitSharingReceiver record, Integer pageIndex, Integer pageSize); PageInfo<WxProfitSharingReceiver> listAsPage(WxProfitSharingReceiver record, Integer pageIndex, Integer pageSize);


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

@@ -133,6 +133,7 @@ public class WxPayOrderServiceImpl implements WxPayOrderService {
//因为此处是处理订单支付成功了但是订单状态为未支付成功的异常状态,库存不应该再扣减 //因为此处是处理订单支付成功了但是订单状态为未支付成功的异常状态,库存不应该再扣减
//更新wxPayOrder //更新wxPayOrder
oldRecord.setPayOrderStatus(EnumPayStatus.PAY_STATUS_SUCCESS.getCode()); oldRecord.setPayOrderStatus(EnumPayStatus.PAY_STATUS_SUCCESS.getCode());
oldRecord.setTtPayWay(queryResult.getWay());
String timEndStr = queryResult.getEndTimeStr(); String timEndStr = queryResult.getEndTimeStr();
Date timeEnd = null; Date timeEnd = null;
try { try {


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

@@ -379,6 +379,7 @@ public class WxRefundOrderServiceImpl implements WxRefundOrderService {
record.setRefundTimeStart(currentDate); record.setRefundTimeStart(currentDate);
record.setRefundOrderStatus(EnumRefundStatus.REFUND_WAIT.getCode()); record.setRefundOrderStatus(EnumRefundStatus.REFUND_WAIT.getCode());
record.setRefundVendor(payOrder.getPayVendor()); record.setRefundVendor(payOrder.getPayVendor());
record.setTtPayWay(payOrder.getTtPayWay());
// 退款订单 // 退款订单
try { try {
int sqlRow = wxRefundOrderMapper.insert(record); int sqlRow = wxRefundOrderMapper.insert(record);


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

@@ -62,7 +62,7 @@ public class PayServiceFactory {
TtRefundAdapterService ttRefundService; TtRefundAdapterService ttRefundService;
@Autowired @Autowired
WxCashOutAdapterService WxCashOutService;
WxCashOutAdapterService wxCashOutService;


@@ -120,8 +120,8 @@ public class PayServiceFactory {
private Map<Integer,CashOutAdapterService> getCashOutMap() { private Map<Integer,CashOutAdapterService> getCashOutMap() {
if (null == cashoutMap ) { if (null == cashoutMap ) {
cashoutMap = new ConcurrentHashMap<Integer, CashOutAdapterService>(); cashoutMap = new ConcurrentHashMap<Integer, CashOutAdapterService>();
cashoutMap.put(EnumPayWay.PAY_WAY_WECHAT.getCode(), WxCashOutService);
cashoutMap.put(EnumPayWay.PAY_WAY_WECHAT_MA.getCode(), WxCashOutService);
cashoutMap.put(EnumPayWay.PAY_WAY_WECHAT.getCode(), wxCashOutService);
cashoutMap.put(EnumPayWay.PAY_WAY_WECHAT_MA.getCode(), wxCashOutService);
} }
return cashoutMap; return cashoutMap;
} }


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

@@ -25,7 +25,7 @@ public class BaseTtPayAdapterService {
throws Exception { throws Exception {
OrderQueryResult orderQueryResult = DouYinPayHelper.orderQuery(appInfo.getAppId(), payAccount.getApiKey(), oldRecord.getPayOrderNo(), null); OrderQueryResult orderQueryResult = DouYinPayHelper.orderQuery(appInfo.getAppId(), payAccount.getApiKey(), oldRecord.getPayOrderNo(), null);
int code = DouYinPayHelper.getPayStatusFromOrderQueryResult(orderQueryResult,oldRecord.getPayOrderNo()); int code = DouYinPayHelper.getPayStatusFromOrderQueryResult(orderQueryResult,oldRecord.getPayOrderNo());
PayQueryAdapterResult result = new PayQueryAdapterResult(code, EnumPayStatus.getEnum(code).getMessage(), orderQueryResult,oldRecord.getTransactionId(),orderQueryResult.getPayTime());
PayQueryAdapterResult result = new PayQueryAdapterResult(code, EnumPayStatus.getEnum(code).getMessage(),orderQueryResult.getWay(), orderQueryResult,oldRecord.getTransactionId(),orderQueryResult.getPayTime());
return result; return result;
} }




+ 4
- 1
mallinkService/src/main/java/com/iformall/service/pay/service/pay/entity/PayQueryAdapterResult.java Просмотреть файл

@@ -11,15 +11,18 @@ public class PayQueryAdapterResult implements Serializable{


private static final long serialVersionUID = -8271349001408799798L; private static final long serialVersionUID = -8271349001408799798L;
public PayQueryAdapterResult(int code, String msg, Object data,String transactionId,String endTimeStr) {
public PayQueryAdapterResult(int code, String msg, Integer way, Object data,String transactionId,String endTimeStr) {
this.code = code; this.code = code;
this.msg = msg; this.msg = msg;
this.way = way;
this.data = data; this.data = data;
this.transactionId = transactionId; this.transactionId = transactionId;
this.endTimeStr = endTimeStr; this.endTimeStr = endTimeStr;
} }


private int code; private int code;

private Integer way;
private String msg; private String msg;


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

@@ -56,7 +56,7 @@ public class BaseWxPayAdapterService {
Map<String, String> retMap = WxPayOrderServiceHelper.wxOrderPayStatusMap(oldRecord, appInfo, payAccount); Map<String, String> retMap = WxPayOrderServiceHelper.wxOrderPayStatusMap(oldRecord, appInfo, payAccount);
int code = WxPayOrderServiceHelper.getPayStatusFromMap(retMap,oldRecord.getPayOrderNo()); int code = WxPayOrderServiceHelper.getPayStatusFromMap(retMap,oldRecord.getPayOrderNo());
String msg = WxPayOrderServiceHelper.getPayStatusMsg(retMap, oldRecord.getPayOrderNo()); String msg = WxPayOrderServiceHelper.getPayStatusMsg(retMap, oldRecord.getPayOrderNo());
PayQueryAdapterResult result = new PayQueryAdapterResult(code, msg, retMap,retMap.get("transaction_id"),retMap.get("time_end"));
PayQueryAdapterResult result = new PayQueryAdapterResult(code, msg,null, retMap,retMap.get("transaction_id"),retMap.get("time_end"));
return result; return result;
} }




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

@@ -1126,9 +1126,15 @@
and `parent_tenant_id` = #{parentTenantId} and `parent_tenant_id` = #{parentTenantId}
</if> </if>


<if test="orderStatus != null">
<if test="null != orderStatus">
AND order_status = #{orderStatus} AND order_status = #{orderStatus}
</if> </if>
<if test=" null != statusS ">
and `order_status` in
<foreach collection="statusS" index="index" item="sItem" open="(" separator="," close=")">
#{sItem}
</foreach>
</if>
<if test=" null != payVendor "> <if test=" null != payVendor ">
and pay_vendor = #{payVendor} and pay_vendor = #{payVendor}
</if> </if>


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

@@ -19,6 +19,7 @@
<result column="prepay_id" jdbcType="VARCHAR" property="prepayId"/> <result column="prepay_id" jdbcType="VARCHAR" property="prepayId"/>
<result column="transaction_id" jdbcType="VARCHAR" property="transactionId"/> <result column="transaction_id" jdbcType="VARCHAR" property="transactionId"/>
<result column="pay_vendor" jdbcType="INTEGER" property="payVendor"/> <result column="pay_vendor" jdbcType="INTEGER" property="payVendor"/>
<result column="tt_pay_way" jdbcType="INTEGER" property="ttPayWay"/>
<result column="pay_order_no" jdbcType="VARCHAR" property="payOrderNo"/> <result column="pay_order_no" jdbcType="VARCHAR" property="payOrderNo"/>
<result column="pay_order_status" jdbcType="INTEGER" property="payOrderStatus"/> <result column="pay_order_status" jdbcType="INTEGER" property="payOrderStatus"/>
<result column="share" jdbcType="INTEGER" property="share"/> <result column="share" jdbcType="INTEGER" property="share"/>
@@ -37,7 +38,7 @@
<sql id="allColumns"> <sql id="allColumns">
`id`,`tenant_id`,`parent_tenant_id`,`create_time`,`update_time`,`order_id`,`c_user_id`,`open_id`,`b_user_id`, `id`,`tenant_id`,`parent_tenant_id`,`create_time`,`update_time`,`order_id`,`c_user_id`,`open_id`,`b_user_id`,
`auth_code`,`ip`,`pay_amount`,`pay_time_start`,`pay_time_end`, `auth_code`,`ip`,`pay_amount`,`pay_time_start`,`pay_time_end`,
`prepay_id`,`transaction_id`,`pay_vendor`,`pay_order_no`,
`prepay_id`,`transaction_id`,`pay_vendor`,`tt_pay_way`,`pay_order_no`,
`pay_order_status`,`share`,`share_amount`,`rate_amount`,`fail_reason`, `pay_order_status`,`share`,`share_amount`,`rate_amount`,`fail_reason`,
`pos_pay_order_id`,`pos_pay_order_time`,`pos_payment_type`,`pos_pay_order_no`,`pos_pay_des`,`compose_order`, `pos_pay_order_id`,`pos_pay_order_time`,`pos_payment_type`,`pos_pay_order_no`,`pos_pay_des`,`compose_order`,
`child_order_share` `child_order_share`
@@ -113,6 +114,10 @@
and `pay_vendor` = #{payVendor} and `pay_vendor` = #{payVendor}
</if> </if>


<if test=" null != ttPayWay ">
and `tt_pay_way` = #{ttPayWay}
</if>

<if test=" null != payOrderNo "> <if test=" null != payOrderNo ">
and `pay_order_no` like concat('%', #{payOrderNo},'%') and `pay_order_no` like concat('%', #{payOrderNo},'%')
</if> </if>


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

@@ -16,13 +16,14 @@
<result column="refund_time_start" jdbcType="TIMESTAMP" property="refundTimeStart" /> <result column="refund_time_start" jdbcType="TIMESTAMP" property="refundTimeStart" />
<result column="refund_time_end" jdbcType="TIMESTAMP" property="refundTimeEnd" /> <result column="refund_time_end" jdbcType="TIMESTAMP" property="refundTimeEnd" />
<result column="refund_vendor" jdbcType="INTEGER" property="refundVendor" /> <result column="refund_vendor" jdbcType="INTEGER" property="refundVendor" />
<result column="tt_pay_way" jdbcType="INTEGER" property="ttPayWay"/>
<result column="refund_order_status" jdbcType="INTEGER" property="refundOrderStatus" /> <result column="refund_order_status" jdbcType="INTEGER" property="refundOrderStatus" />
<result column="refund_id" jdbcType="VARCHAR" property="refundId" /> <result column="refund_id" jdbcType="VARCHAR" property="refundId" />
<result column="fail_reason" jdbcType="VARCHAR" property="failReason" /> <result column="fail_reason" jdbcType="VARCHAR" property="failReason" />
</resultMap> </resultMap>
<sql id="allColumns"> <sql id="allColumns">
`id`,`tenant_id`,`parent_tenant_id`,`create_time`,`update_time`,`transaction_id`,`order_id`,`pay_order_no`,`c_user_id`,`total_fee`,`refund_fee`,`refund_time_start`,`refund_time_end`,`refund_vendor`,`refund_order_status`,`refund_id`,`fail_reason`
`id`,`tenant_id`,`parent_tenant_id`,`create_time`,`update_time`,`transaction_id`,`order_id`,`pay_order_no`,`c_user_id`,`total_fee`,`refund_fee`,`refund_time_start`,`refund_time_end`,`refund_vendor`,`tt_pay_way`,`refund_order_status`,`refund_id`,`fail_reason`
</sql> </sql>


<sql id="dynamicWhereConditions"> <sql id="dynamicWhereConditions">


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