diff --git a/mallinkAdmin/src/main/resources/db/migration/V2022042600002__refund.sql b/mallinkAdmin/src/main/resources/db/migration/V2022042600002__refund.sql new file mode 100644 index 000000000..ebb6f187b --- /dev/null +++ b/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`; diff --git a/mallinkAdmin/src/main/resources/db/migration/V2022042700001__addmenu.sql b/mallinkAdmin/src/main/resources/db/migration/V2022042700001__addmenu.sql new file mode 100644 index 000000000..163479917 --- /dev/null +++ b/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; + diff --git a/mallinkCApi/src/main/java/com/iformall/controller/WxOrderController.java b/mallinkCApi/src/main/java/com/iformall/controller/WxOrderController.java index d7f48d466..536faa4ce 100644 --- a/mallinkCApi/src/main/java/com/iformall/controller/WxOrderController.java +++ b/mallinkCApi/src/main/java/com/iformall/controller/WxOrderController.java @@ -564,6 +564,11 @@ public class WxOrderController extends BaseController { } catch (Exception e) { 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.setSortColumns(BaseEntity.SortField.UpdateDate_DESC); wxOrder.updateTenantInfo(getTenantInfo()); @@ -616,8 +621,8 @@ public class WxOrderController extends BaseController { return new ResultData(ErrorCode.ORDER_IS_NOT_FIND); } 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()); return new ResultData(ErrorCode.ORDER_IS_NOT_FIND.getCode(),"订单不是退款状态"); } diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxPayOrder.java b/mallinkService/src/main/java/com/iformall/domain/po/WxPayOrder.java index 05899321d..522187361 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxPayOrder.java +++ b/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") 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") private Long posPayOrderId; @io.swagger.annotations.ApiModelProperty(value="支付订单创建时间,来源于POS",name="posPayOrderTime") diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxRefundOrder.java b/mallinkService/src/main/java/com/iformall/domain/po/WxRefundOrder.java index ca37c4ebc..2ab1c12df 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxRefundOrder.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxRefundOrder.java @@ -38,6 +38,8 @@ public class WxRefundOrder extends TenantEntity { private Date refundTimeEnd; @io.swagger.annotations.ApiModelProperty(value="支付渠道: 0-微信 1-支付宝 2-银联 ",name="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") private Integer refundOrderStatus; @io.swagger.annotations.ApiModelProperty(value="微信退款单号",name="refundId") diff --git a/mallinkService/src/main/java/com/iformall/douyin/pay/orderQuery/OrderQueryResult.java b/mallinkService/src/main/java/com/iformall/douyin/pay/orderQuery/OrderQueryResult.java index d6e259f6d..d25c79e6e 100644 --- a/mallinkService/src/main/java/com/iformall/douyin/pay/orderQuery/OrderQueryResult.java +++ b/mallinkService/src/main/java/com/iformall/douyin/pay/orderQuery/OrderQueryResult.java @@ -8,6 +8,9 @@ public class OrderQueryResult { private Integer totalFee; private String orderStatus;//"PROCESSING-处理中|SUCCESS-成功|FAIL-失败|TIMEOUT-超时" private String payTime; + /** + * 1-微信支付,2-支付宝支付,10-抖音支付 + */ private Integer way; private String channelNo; private String channelGatewayNo; diff --git a/mallinkService/src/main/java/com/iformall/enums/EnumOrderStatus.java b/mallinkService/src/main/java/com/iformall/enums/EnumOrderStatus.java index 7756a08a2..77346978b 100644 --- a/mallinkService/src/main/java/com/iformall/enums/EnumOrderStatus.java +++ b/mallinkService/src/main/java/com/iformall/enums/EnumOrderStatus.java @@ -1,5 +1,8 @@ package com.iformall.enums; +import java.util.ArrayList; +import java.util.List; + /** * Created by Stormeye on 2018/08/09. */ @@ -52,4 +55,12 @@ public enum EnumOrderStatus { public String getMessage() { return message; } + + public static List getRefundStatus(){ + List 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; + } } diff --git a/mallinkService/src/main/java/com/iformall/service/WxProfitSharingReceiverService.java b/mallinkService/src/main/java/com/iformall/service/WxProfitSharingReceiverService.java index 62b621414..07e0a9d4d 100644 --- a/mallinkService/src/main/java/com/iformall/service/WxProfitSharingReceiverService.java +++ b/mallinkService/src/main/java/com/iformall/service/WxProfitSharingReceiverService.java @@ -16,8 +16,6 @@ public interface WxProfitSharingReceiverService { * 根据实体查询分页列表 * * @param record - * @param offset - * @param limit * @return */ PageInfo listAsPage(WxProfitSharingReceiver record, Integer pageIndex, Integer pageSize); diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxPayOrderServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxPayOrderServiceImpl.java index c071bc562..349229451 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxPayOrderServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxPayOrderServiceImpl.java @@ -133,6 +133,7 @@ public class WxPayOrderServiceImpl implements WxPayOrderService { //因为此处是处理订单支付成功了但是订单状态为未支付成功的异常状态,库存不应该再扣减 //更新wxPayOrder oldRecord.setPayOrderStatus(EnumPayStatus.PAY_STATUS_SUCCESS.getCode()); + oldRecord.setTtPayWay(queryResult.getWay()); String timEndStr = queryResult.getEndTimeStr(); Date timeEnd = null; try { diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxRefundOrderServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxRefundOrderServiceImpl.java index 4d5ac0e0b..833a7d90e 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxRefundOrderServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxRefundOrderServiceImpl.java @@ -379,6 +379,7 @@ public class WxRefundOrderServiceImpl implements WxRefundOrderService { record.setRefundTimeStart(currentDate); record.setRefundOrderStatus(EnumRefundStatus.REFUND_WAIT.getCode()); record.setRefundVendor(payOrder.getPayVendor()); + record.setTtPayWay(payOrder.getTtPayWay()); // 退款订单 try { int sqlRow = wxRefundOrderMapper.insert(record); diff --git a/mallinkService/src/main/java/com/iformall/service/pay/PayServiceFactory.java b/mallinkService/src/main/java/com/iformall/service/pay/PayServiceFactory.java index 03fd0da8e..c71eeac78 100644 --- a/mallinkService/src/main/java/com/iformall/service/pay/PayServiceFactory.java +++ b/mallinkService/src/main/java/com/iformall/service/pay/PayServiceFactory.java @@ -62,7 +62,7 @@ public class PayServiceFactory { TtRefundAdapterService ttRefundService; @Autowired - WxCashOutAdapterService WxCashOutService; + WxCashOutAdapterService wxCashOutService; @@ -120,8 +120,8 @@ public class PayServiceFactory { private Map getCashOutMap() { if (null == cashoutMap ) { cashoutMap = new ConcurrentHashMap(); - 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; } diff --git a/mallinkService/src/main/java/com/iformall/service/pay/service/pay/douyin/BaseTtPayAdapterService.java b/mallinkService/src/main/java/com/iformall/service/pay/service/pay/douyin/BaseTtPayAdapterService.java index 4ccaea015..be31e220a 100644 --- a/mallinkService/src/main/java/com/iformall/service/pay/service/pay/douyin/BaseTtPayAdapterService.java +++ b/mallinkService/src/main/java/com/iformall/service/pay/service/pay/douyin/BaseTtPayAdapterService.java @@ -25,7 +25,7 @@ public class BaseTtPayAdapterService { throws Exception { OrderQueryResult orderQueryResult = DouYinPayHelper.orderQuery(appInfo.getAppId(), payAccount.getApiKey(), oldRecord.getPayOrderNo(), null); 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; } diff --git a/mallinkService/src/main/java/com/iformall/service/pay/service/pay/entity/PayQueryAdapterResult.java b/mallinkService/src/main/java/com/iformall/service/pay/service/pay/entity/PayQueryAdapterResult.java index e01923de3..4f41c3f5f 100644 --- a/mallinkService/src/main/java/com/iformall/service/pay/service/pay/entity/PayQueryAdapterResult.java +++ b/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; - 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.msg = msg; + this.way = way; this.data = data; this.transactionId = transactionId; this.endTimeStr = endTimeStr; } private int code; + + private Integer way; private String msg; diff --git a/mallinkService/src/main/java/com/iformall/service/pay/service/pay/wx/BaseWxPayAdapterService.java b/mallinkService/src/main/java/com/iformall/service/pay/service/pay/wx/BaseWxPayAdapterService.java index f11e1f44a..8d7e2c87d 100644 --- a/mallinkService/src/main/java/com/iformall/service/pay/service/pay/wx/BaseWxPayAdapterService.java +++ b/mallinkService/src/main/java/com/iformall/service/pay/service/pay/wx/BaseWxPayAdapterService.java @@ -56,7 +56,7 @@ public class BaseWxPayAdapterService { Map retMap = WxPayOrderServiceHelper.wxOrderPayStatusMap(oldRecord, appInfo, payAccount); int code = WxPayOrderServiceHelper.getPayStatusFromMap(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; } diff --git a/mallinkService/src/main/resources/mapper/WxOrderMapper.xml b/mallinkService/src/main/resources/mapper/WxOrderMapper.xml index 52f0f01a7..d1cf81f38 100644 --- a/mallinkService/src/main/resources/mapper/WxOrderMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxOrderMapper.xml @@ -1126,9 +1126,15 @@ and `parent_tenant_id` = #{parentTenantId} - + AND order_status = #{orderStatus} + + and `order_status` in + + #{sItem} + + and pay_vendor = #{payVendor} diff --git a/mallinkService/src/main/resources/mapper/WxPayOrderMapper.xml b/mallinkService/src/main/resources/mapper/WxPayOrderMapper.xml index 06c8c5cc2..fe37c2d6a 100644 --- a/mallinkService/src/main/resources/mapper/WxPayOrderMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxPayOrderMapper.xml @@ -19,6 +19,7 @@ + @@ -37,7 +38,7 @@ `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`, - `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`, `pos_pay_order_id`,`pos_pay_order_time`,`pos_payment_type`,`pos_pay_order_no`,`pos_pay_des`,`compose_order`, `child_order_share` @@ -113,6 +114,10 @@ and `pay_vendor` = #{payVendor} + + and `tt_pay_way` = #{ttPayWay} + + and `pay_order_no` like concat('%', #{payOrderNo},'%') diff --git a/mallinkService/src/main/resources/mapper/WxRefundOrderMapper.xml b/mallinkService/src/main/resources/mapper/WxRefundOrderMapper.xml index 088e69081..2afdd524e 100644 --- a/mallinkService/src/main/resources/mapper/WxRefundOrderMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxRefundOrderMapper.xml @@ -16,13 +16,14 @@ + - `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`