From 068f9294b8162835b7d966876d2b317b79bb69c6 Mon Sep 17 00:00:00 2001 From: xhxu Date: Wed, 29 Jun 2022 20:21:24 +0800 Subject: [PATCH] //tt ORDER --- .../migration/V2022062900001__pay_order.sql | 200 ++++++++++++++++++ .../com/iformall/domain/po/WxPayOrder.java | 2 + .../miniApp/TtMiniAppPayAdapterService.java | 18 +- .../resources/mapper/WxPayOrderMapper.xml | 3 +- 4 files changed, 217 insertions(+), 6 deletions(-) create mode 100644 mallinkAdmin/src/main/resources/db/migration/V2022062900001__pay_order.sql diff --git a/mallinkAdmin/src/main/resources/db/migration/V2022062900001__pay_order.sql b/mallinkAdmin/src/main/resources/db/migration/V2022062900001__pay_order.sql new file mode 100644 index 000000000..ee061261f --- /dev/null +++ b/mallinkAdmin/src/main/resources/db/migration/V2022062900001__pay_order.sql @@ -0,0 +1,200 @@ +ALTER TABLE `mallink`.`wx_pay_order_0` +ADD COLUMN `pay_param` json COMMENT '额外参数' AFTER `pay_order_status`; +ALTER TABLE `mallink`.`wx_pay_order_1` +ADD COLUMN `pay_param` json COMMENT '额外参数' AFTER `pay_order_status`; +ALTER TABLE `mallink`.`wx_pay_order_2` +ADD COLUMN `pay_param` json COMMENT '额外参数' AFTER `pay_order_status`; +ALTER TABLE `mallink`.`wx_pay_order_3` +ADD COLUMN `pay_param` json COMMENT '额外参数' AFTER `pay_order_status`; +ALTER TABLE `mallink`.`wx_pay_order_4` +ADD COLUMN `pay_param` json COMMENT '额外参数' AFTER `pay_order_status`; +ALTER TABLE `mallink`.`wx_pay_order_5` +ADD COLUMN `pay_param` json COMMENT '额外参数' AFTER `pay_order_status`; +ALTER TABLE `mallink`.`wx_pay_order_6` +ADD COLUMN `pay_param` json COMMENT '额外参数' AFTER `pay_order_status`; +ALTER TABLE `mallink`.`wx_pay_order_7` +ADD COLUMN `pay_param` json COMMENT '额外参数' AFTER `pay_order_status`; +ALTER TABLE `mallink`.`wx_pay_order_8` +ADD COLUMN `pay_param` json COMMENT '额外参数' AFTER `pay_order_status`; +ALTER TABLE `mallink`.`wx_pay_order_9` +ADD COLUMN `pay_param` json COMMENT '额外参数' AFTER `pay_order_status`; +ALTER TABLE `mallink`.`wx_pay_order_10` +ADD COLUMN `pay_param` json COMMENT '额外参数' AFTER `pay_order_status`; +ALTER TABLE `mallink`.`wx_pay_order_11` +ADD COLUMN `pay_param` json COMMENT '额外参数' AFTER `pay_order_status`; +ALTER TABLE `mallink`.`wx_pay_order_12` +ADD COLUMN `pay_param` json COMMENT '额外参数' AFTER `pay_order_status`; +ALTER TABLE `mallink`.`wx_pay_order_13` +ADD COLUMN `pay_param` json COMMENT '额外参数' AFTER `pay_order_status`; +ALTER TABLE `mallink`.`wx_pay_order_14` +ADD COLUMN `pay_param` json COMMENT '额外参数' AFTER `pay_order_status`; +ALTER TABLE `mallink`.`wx_pay_order_15` +ADD COLUMN `pay_param` json COMMENT '额外参数' AFTER `pay_order_status`; +ALTER TABLE `mallink`.`wx_pay_order_16` +ADD COLUMN `pay_param` json COMMENT '额外参数' AFTER `pay_order_status`; +ALTER TABLE `mallink`.`wx_pay_order_17` +ADD COLUMN `pay_param` json COMMENT '额外参数' AFTER `pay_order_status`; +ALTER TABLE `mallink`.`wx_pay_order_18` +ADD COLUMN `pay_param` json COMMENT '额外参数' AFTER `pay_order_status`; +ALTER TABLE `mallink`.`wx_pay_order_19` +ADD COLUMN `pay_param` json COMMENT '额外参数' AFTER `pay_order_status`; +ALTER TABLE `mallink`.`wx_pay_order_20` +ADD COLUMN `pay_param` json COMMENT '额外参数' AFTER `pay_order_status`; +ALTER TABLE `mallink`.`wx_pay_order_21` +ADD COLUMN `pay_param` json COMMENT '额外参数' AFTER `pay_order_status`; +ALTER TABLE `mallink`.`wx_pay_order_22` +ADD COLUMN `pay_param` json COMMENT '额外参数' AFTER `pay_order_status`; +ALTER TABLE `mallink`.`wx_pay_order_23` +ADD COLUMN `pay_param` json COMMENT '额外参数' AFTER `pay_order_status`; +ALTER TABLE `mallink`.`wx_pay_order_24` +ADD COLUMN `pay_param` json COMMENT '额外参数' AFTER `pay_order_status`; +ALTER TABLE `mallink`.`wx_pay_order_25` +ADD COLUMN `pay_param` json COMMENT '额外参数' AFTER `pay_order_status`; +ALTER TABLE `mallink`.`wx_pay_order_26` +ADD COLUMN `pay_param` json COMMENT '额外参数' AFTER `pay_order_status`; +ALTER TABLE `mallink`.`wx_pay_order_27` +ADD COLUMN `pay_param` json COMMENT '额外参数' AFTER `pay_order_status`; +ALTER TABLE `mallink`.`wx_pay_order_28` +ADD COLUMN `pay_param` json COMMENT '额外参数' AFTER `pay_order_status`; +ALTER TABLE `mallink`.`wx_pay_order_29` +ADD COLUMN `pay_param` json COMMENT '额外参数' AFTER `pay_order_status`; +ALTER TABLE `mallink`.`wx_pay_order_30` +ADD COLUMN `pay_param` json COMMENT '额外参数' AFTER `pay_order_status`; +ALTER TABLE `mallink`.`wx_pay_order_31` +ADD COLUMN `pay_param` json COMMENT '额外参数' AFTER `pay_order_status`; +ALTER TABLE `mallink`.`wx_pay_order_32` +ADD COLUMN `pay_param` json COMMENT '额外参数' AFTER `pay_order_status`; +ALTER TABLE `mallink`.`wx_pay_order_33` +ADD COLUMN `pay_param` json COMMENT '额外参数' AFTER `pay_order_status`; +ALTER TABLE `mallink`.`wx_pay_order_34` +ADD COLUMN `pay_param` json COMMENT '额外参数' AFTER `pay_order_status`; +ALTER TABLE `mallink`.`wx_pay_order_35` +ADD COLUMN `pay_param` json COMMENT '额外参数' AFTER `pay_order_status`; +ALTER TABLE `mallink`.`wx_pay_order_36` +ADD COLUMN `pay_param` json COMMENT '额外参数' AFTER `pay_order_status`; +ALTER TABLE `mallink`.`wx_pay_order_37` +ADD COLUMN `pay_param` json COMMENT '额外参数' AFTER `pay_order_status`; +ALTER TABLE `mallink`.`wx_pay_order_38` +ADD COLUMN `pay_param` json COMMENT '额外参数' AFTER `pay_order_status`; +ALTER TABLE `mallink`.`wx_pay_order_39` +ADD COLUMN `pay_param` json COMMENT '额外参数' AFTER `pay_order_status`; +ALTER TABLE `mallink`.`wx_pay_order_40` +ADD COLUMN `pay_param` json COMMENT '额外参数' AFTER `pay_order_status`; +ALTER TABLE `mallink`.`wx_pay_order_41` +ADD COLUMN `pay_param` json COMMENT '额外参数' AFTER `pay_order_status`; +ALTER TABLE `mallink`.`wx_pay_order_42` +ADD COLUMN `pay_param` json COMMENT '额外参数' AFTER `pay_order_status`; +ALTER TABLE `mallink`.`wx_pay_order_43` +ADD COLUMN `pay_param` json COMMENT '额外参数' AFTER `pay_order_status`; +ALTER TABLE `mallink`.`wx_pay_order_44` +ADD COLUMN `pay_param` json COMMENT '额外参数' AFTER `pay_order_status`; +ALTER TABLE `mallink`.`wx_pay_order_45` +ADD COLUMN `pay_param` json COMMENT '额外参数' AFTER `pay_order_status`; +ALTER TABLE `mallink`.`wx_pay_order_46` +ADD COLUMN `pay_param` json COMMENT '额外参数' AFTER `pay_order_status`; +ALTER TABLE `mallink`.`wx_pay_order_47` +ADD COLUMN `pay_param` json COMMENT '额外参数' AFTER `pay_order_status`; +ALTER TABLE `mallink`.`wx_pay_order_48` +ADD COLUMN `pay_param` json COMMENT '额外参数' AFTER `pay_order_status`; +ALTER TABLE `mallink`.`wx_pay_order_49` +ADD COLUMN `pay_param` json COMMENT '额外参数' AFTER `pay_order_status`; +ALTER TABLE `mallink`.`wx_pay_order_50` +ADD COLUMN `pay_param` json COMMENT '额外参数' AFTER `pay_order_status`; +ALTER TABLE `mallink`.`wx_pay_order_51` +ADD COLUMN `pay_param` json COMMENT '额外参数' AFTER `pay_order_status`; +ALTER TABLE `mallink`.`wx_pay_order_52` +ADD COLUMN `pay_param` json COMMENT '额外参数' AFTER `pay_order_status`; +ALTER TABLE `mallink`.`wx_pay_order_53` +ADD COLUMN `pay_param` json COMMENT '额外参数' AFTER `pay_order_status`; +ALTER TABLE `mallink`.`wx_pay_order_54` +ADD COLUMN `pay_param` json COMMENT '额外参数' AFTER `pay_order_status`; +ALTER TABLE `mallink`.`wx_pay_order_55` +ADD COLUMN `pay_param` json COMMENT '额外参数' AFTER `pay_order_status`; +ALTER TABLE `mallink`.`wx_pay_order_56` +ADD COLUMN `pay_param` json COMMENT '额外参数' AFTER `pay_order_status`; +ALTER TABLE `mallink`.`wx_pay_order_57` +ADD COLUMN `pay_param` json COMMENT '额外参数' AFTER `pay_order_status`; +ALTER TABLE `mallink`.`wx_pay_order_58` +ADD COLUMN `pay_param` json COMMENT '额外参数' AFTER `pay_order_status`; +ALTER TABLE `mallink`.`wx_pay_order_59` +ADD COLUMN `pay_param` json COMMENT '额外参数' AFTER `pay_order_status`; +ALTER TABLE `mallink`.`wx_pay_order_60` +ADD COLUMN `pay_param` json COMMENT '额外参数' AFTER `pay_order_status`; +ALTER TABLE `mallink`.`wx_pay_order_61` +ADD COLUMN `pay_param` json COMMENT '额外参数' AFTER `pay_order_status`; +ALTER TABLE `mallink`.`wx_pay_order_62` +ADD COLUMN `pay_param` json COMMENT '额外参数' AFTER `pay_order_status`; +ALTER TABLE `mallink`.`wx_pay_order_63` +ADD COLUMN `pay_param` json COMMENT '额外参数' AFTER `pay_order_status`; +ALTER TABLE `mallink`.`wx_pay_order_64` +ADD COLUMN `pay_param` json COMMENT '额外参数' AFTER `pay_order_status`; +ALTER TABLE `mallink`.`wx_pay_order_65` +ADD COLUMN `pay_param` json COMMENT '额外参数' AFTER `pay_order_status`; +ALTER TABLE `mallink`.`wx_pay_order_66` +ADD COLUMN `pay_param` json COMMENT '额外参数' AFTER `pay_order_status`; +ALTER TABLE `mallink`.`wx_pay_order_67` +ADD COLUMN `pay_param` json COMMENT '额外参数' AFTER `pay_order_status`; +ALTER TABLE `mallink`.`wx_pay_order_68` +ADD COLUMN `pay_param` json COMMENT '额外参数' AFTER `pay_order_status`; +ALTER TABLE `mallink`.`wx_pay_order_69` +ADD COLUMN `pay_param` json COMMENT '额外参数' AFTER `pay_order_status`; +ALTER TABLE `mallink`.`wx_pay_order_70` +ADD COLUMN `pay_param` json COMMENT '额外参数' AFTER `pay_order_status`; +ALTER TABLE `mallink`.`wx_pay_order_71` +ADD COLUMN `pay_param` json COMMENT '额外参数' AFTER `pay_order_status`; +ALTER TABLE `mallink`.`wx_pay_order_72` +ADD COLUMN `pay_param` json COMMENT '额外参数' AFTER `pay_order_status`; +ALTER TABLE `mallink`.`wx_pay_order_73` +ADD COLUMN `pay_param` json COMMENT '额外参数' AFTER `pay_order_status`; +ALTER TABLE `mallink`.`wx_pay_order_74` +ADD COLUMN `pay_param` json COMMENT '额外参数' AFTER `pay_order_status`; +ALTER TABLE `mallink`.`wx_pay_order_75` +ADD COLUMN `pay_param` json COMMENT '额外参数' AFTER `pay_order_status`; +ALTER TABLE `mallink`.`wx_pay_order_76` +ADD COLUMN `pay_param` json COMMENT '额外参数' AFTER `pay_order_status`; +ALTER TABLE `mallink`.`wx_pay_order_77` +ADD COLUMN `pay_param` json COMMENT '额外参数' AFTER `pay_order_status`; +ALTER TABLE `mallink`.`wx_pay_order_78` +ADD COLUMN `pay_param` json COMMENT '额外参数' AFTER `pay_order_status`; +ALTER TABLE `mallink`.`wx_pay_order_79` +ADD COLUMN `pay_param` json COMMENT '额外参数' AFTER `pay_order_status`; +ALTER TABLE `mallink`.`wx_pay_order_80` +ADD COLUMN `pay_param` json COMMENT '额外参数' AFTER `pay_order_status`; +ALTER TABLE `mallink`.`wx_pay_order_81` +ADD COLUMN `pay_param` json COMMENT '额外参数' AFTER `pay_order_status`; +ALTER TABLE `mallink`.`wx_pay_order_82` +ADD COLUMN `pay_param` json COMMENT '额外参数' AFTER `pay_order_status`; +ALTER TABLE `mallink`.`wx_pay_order_83` +ADD COLUMN `pay_param` json COMMENT '额外参数' AFTER `pay_order_status`; +ALTER TABLE `mallink`.`wx_pay_order_84` +ADD COLUMN `pay_param` json COMMENT '额外参数' AFTER `pay_order_status`; +ALTER TABLE `mallink`.`wx_pay_order_85` +ADD COLUMN `pay_param` json COMMENT '额外参数' AFTER `pay_order_status`; +ALTER TABLE `mallink`.`wx_pay_order_86` +ADD COLUMN `pay_param` json COMMENT '额外参数' AFTER `pay_order_status`; +ALTER TABLE `mallink`.`wx_pay_order_87` +ADD COLUMN `pay_param` json COMMENT '额外参数' AFTER `pay_order_status`; +ALTER TABLE `mallink`.`wx_pay_order_88` +ADD COLUMN `pay_param` json COMMENT '额外参数' AFTER `pay_order_status`; +ALTER TABLE `mallink`.`wx_pay_order_89` +ADD COLUMN `pay_param` json COMMENT '额外参数' AFTER `pay_order_status`; +ALTER TABLE `mallink`.`wx_pay_order_90` +ADD COLUMN `pay_param` json COMMENT '额外参数' AFTER `pay_order_status`; +ALTER TABLE `mallink`.`wx_pay_order_91` +ADD COLUMN `pay_param` json COMMENT '额外参数' AFTER `pay_order_status`; +ALTER TABLE `mallink`.`wx_pay_order_92` +ADD COLUMN `pay_param` json COMMENT '额外参数' AFTER `pay_order_status`; +ALTER TABLE `mallink`.`wx_pay_order_93` +ADD COLUMN `pay_param` json COMMENT '额外参数' AFTER `pay_order_status`; +ALTER TABLE `mallink`.`wx_pay_order_94` +ADD COLUMN `pay_param` json COMMENT '额外参数' AFTER `pay_order_status`; +ALTER TABLE `mallink`.`wx_pay_order_95` +ADD COLUMN `pay_param` json COMMENT '额外参数' AFTER `pay_order_status`; +ALTER TABLE `mallink`.`wx_pay_order_96` +ADD COLUMN `pay_param` json COMMENT '额外参数' AFTER `pay_order_status`; +ALTER TABLE `mallink`.`wx_pay_order_97` +ADD COLUMN `pay_param` json COMMENT '额外参数' AFTER `pay_order_status`; +ALTER TABLE `mallink`.`wx_pay_order_98` +ADD COLUMN `pay_param` json COMMENT '额外参数' AFTER `pay_order_status`; +ALTER TABLE `mallink`.`wx_pay_order_99` +ADD COLUMN `pay_param` json COMMENT '额外参数' AFTER `pay_order_status`; \ No newline at end of file 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 522187361..10bbcc903 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxPayOrder.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxPayOrder.java @@ -57,6 +57,8 @@ public class WxPayOrder extends TenantEntity { private String payOrderNo; @io.swagger.annotations.ApiModelProperty(value="支付状态: 0-支付中;1-支付成功;2-支付失败",name="payOrderStatus") private Integer payOrderStatus; + @io.swagger.annotations.ApiModelProperty(value="支付额外参数",name="payParam") + private String payParam; @io.swagger.annotations.ApiModelProperty(value="分账状态: 0-未分账;1-分账",name="payOrderStatus") private Integer share; @io.swagger.annotations.ApiModelProperty(value="分账金额(总金额扣除手续费后的金额)",name="shareAmount") diff --git a/mallinkService/src/main/java/com/iformall/service/pay/service/pay/douyin/miniApp/TtMiniAppPayAdapterService.java b/mallinkService/src/main/java/com/iformall/service/pay/service/pay/douyin/miniApp/TtMiniAppPayAdapterService.java index e327fb11a..3871e570c 100644 --- a/mallinkService/src/main/java/com/iformall/service/pay/service/pay/douyin/miniApp/TtMiniAppPayAdapterService.java +++ b/mallinkService/src/main/java/com/iformall/service/pay/service/pay/douyin/miniApp/TtMiniAppPayAdapterService.java @@ -67,6 +67,14 @@ public class TtMiniAppPayAdapterService extends BaseTtPayAdapterService implemen @Override public PayAdapterResult pay(WxPayAccount payAccount, WxPayOrder record,WxComposeOrder composeOrder,String productName,EnumPayShare isShare,WxAppinfo appInfo,Date currentDate, PayExtraParam params) throws Exception { + if(StringUtils.isNotBlank(record.getPayParam())){ + record.setUpdateTime(new Date()); + PayAdapterResult par = new PayAdapterResult(); + par.setSuccess(true); + par.setTransactionId(record.getTransactionId()); + par.setData(JSONObject.parseObject(record.getPayParam())); + return par; + } if (null == params ) { throw new MallinkException(ErrorCode.SYS_PARAMETER_NOT_NULL.getCode(),"openId为空"); } @@ -112,10 +120,6 @@ public class TtMiniAppPayAdapterService extends BaseTtPayAdapterService implemen TtPayUnifiedOrderV2Result orderV2 = ttPayService.createOrderV2(request); - record.setPrepayId(orderV2.getPayOrderId()); - record.setTransactionId(orderV2.getOrderId()); - record.setUpdateTime(new Date()); - JSONObject allExtParam = new JSONObject(); allExtParam.put("order_id",orderV2.getOrderId()); allExtParam.put("total_amount",composeOrder.getPayment()); @@ -146,11 +150,15 @@ public class TtMiniAppPayAdapterService extends BaseTtPayAdapterService implemen throw new Exception("下单数据异常"); } } + orderV2.setItemOrderInfoList(null); +// record.setPrepayId(orderV2.getPayOrderId()); + record.setPayParam(JSON.toJSONString(orderV2)); + record.setTransactionId(orderV2.getOrderId()); + record.setUpdateTime(new Date()); PayAdapterResult par = new PayAdapterResult(); par.setSuccess(true); par.setTransactionId(orderV2.getOrderId()); - orderV2.setItemOrderInfoList(null); par.setData(orderV2); return par; diff --git a/mallinkService/src/main/resources/mapper/WxPayOrderMapper.xml b/mallinkService/src/main/resources/mapper/WxPayOrderMapper.xml index fe37c2d6a..7c4ecd1e7 100644 --- a/mallinkService/src/main/resources/mapper/WxPayOrderMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxPayOrderMapper.xml @@ -22,6 +22,7 @@ + @@ -39,7 +40,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`,`tt_pay_way`,`pay_order_no`, - `pay_order_status`,`share`,`share_amount`,`rate_amount`,`fail_reason`, + `pay_order_status`,`pay_param`,`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`