From 4b9c0b3a2cca4aff4ab9847aac766098075cee7e Mon Sep 17 00:00:00 2001 From: dimengzhe <251008545@qq.com> Date: Wed, 8 Mar 2023 10:47:13 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E8=AE=A2=E5=8D=95=E6=94=B6=E8=B4=A7?= =?UTF-8?q?=E4=BA=BA=E3=80=81=E7=94=B5=E8=AF=9D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/zscat/mallplus/enums/ConstansValue.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mallplus-mbg/src/main/java/com/zscat/mallplus/enums/ConstansValue.java b/mallplus-mbg/src/main/java/com/zscat/mallplus/enums/ConstansValue.java index eecb50c..59d3789 100644 --- a/mallplus-mbg/src/main/java/com/zscat/mallplus/enums/ConstansValue.java +++ b/mallplus-mbg/src/main/java/com/zscat/mallplus/enums/ConstansValue.java @@ -22,7 +22,7 @@ public class ConstansValue { " original_price,\n" + " weight \n" + " "; - public static final String sampleOrderList = "id,member_id, order_sn, create_time, member_username, total_amount, pay_amount,status, order_type,pay_type,source_type,goods_id,goods_name,delivery_sn,delivery_company"; + public static final String sampleOrderList = "id,member_id, order_sn, create_time, member_username, total_amount, pay_amount,status, order_type,pay_type,source_type,goods_id,goods_name,delivery_sn,delivery_company,receiver_name,receiver_phone,receiver_detail_address,receiver_region"; public static final String sampleSubjectList = "id, category_id, title, pic, product_count, recommend_status, create_time, collect_count, read_count, comment_count, album_pics, description, show_status, forward_count, category_name, area_id, school_id, member_id, area_name, school_name, reward, member_name, video_src, type"; From d9e6b0a653f65325611be29232f7f4f50780f255 Mon Sep 17 00:00:00 2001 From: dimengzhe <251008545@qq.com> Date: Wed, 8 Mar 2023 11:13:23 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E5=BE=AE=E4=BF=A1=E6=94=AF=E4=BB=98?= =?UTF-8?q?=E3=80=81=E6=94=AF=E4=BB=98=E5=AE=9D=E6=94=AF=E4=BB=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/zscat/mallplus/oms/entity/OmsOrder.java | 2 +- .../zscat/mallplus/pay/controller/alipay/AliPayController.java | 1 + .../zscat/mallplus/pay/controller/wxpay/WxPayController.java | 1 + 3 files changed, 3 insertions(+), 1 deletion(-) diff --git a/mallplus-mbg/src/main/java/com/zscat/mallplus/oms/entity/OmsOrder.java b/mallplus-mbg/src/main/java/com/zscat/mallplus/oms/entity/OmsOrder.java index f88261b..55ed6f1 100644 --- a/mallplus-mbg/src/main/java/com/zscat/mallplus/oms/entity/OmsOrder.java +++ b/mallplus-mbg/src/main/java/com/zscat/mallplus/oms/entity/OmsOrder.java @@ -120,7 +120,7 @@ public class OmsOrder extends BaseEntity implements Serializable { private BigDecimal discountAmount; /** - * 支付方式：0->未支付；2->支付宝；1->微信 3余额支付 + * 支付方式：0->未支付；1->支付宝；2->微信 3余额支付 */ @TableField("pay_type") private Integer payType; diff --git a/mallplus-portal/src/main/java/com/zscat/mallplus/pay/controller/alipay/AliPayController.java b/mallplus-portal/src/main/java/com/zscat/mallplus/pay/controller/alipay/AliPayController.java index b4b6465..6895b8f 100644 --- a/mallplus-portal/src/main/java/com/zscat/mallplus/pay/controller/alipay/AliPayController.java +++ b/mallplus-portal/src/main/java/com/zscat/mallplus/pay/controller/alipay/AliPayController.java @@ -834,6 +834,7 @@ public class AliPayController extends AbstractAliPayApiController { OmsOrder orderInfo = list.get(0); orderInfo.setStatus(OrderStatus.TO_DELIVER.getValue()); orderInfo.setPaymentTime(new Date()); + orderInfo.setPayType(1); boolean verifyResult = AlipaySignature.rsaCertCheckV1(params, ALIPAY_PUBLIC_KEY, "UTF-8", "RSA2"); if (verifyResult) { diff --git a/mallplus-portal/src/main/java/com/zscat/mallplus/pay/controller/wxpay/WxPayController.java b/mallplus-portal/src/main/java/com/zscat/mallplus/pay/controller/wxpay/WxPayController.java index 0afd2e9..0de5df4 100644 --- a/mallplus-portal/src/main/java/com/zscat/mallplus/pay/controller/wxpay/WxPayController.java +++ b/mallplus-portal/src/main/java/com/zscat/mallplus/pay/controller/wxpay/WxPayController.java @@ -994,6 +994,7 @@ public class WxPayController extends AbstractWxPayApiController { OmsOrder orderInfo = list.get(0); orderInfo.setStatus(OrderStatus.TO_DELIVER.getValue()); orderInfo.setPaymentTime(new Date()); + orderInfo.setPayType(2); // 注意重复通知的情况，同一订单号可能收到多次通知，请注意一定先判断订单状态 // 注意此处签名方式需与统一下单的签名类型一致 if (WxPayKit.verifyNotify(params, this.getApiConfig().getPartnerKey(), SignType.HMACSHA256)) { From 125123b6627045b36340a585e462bc480aea208e Mon Sep 17 00:00:00 2001 From: dimengzhe <251008545@qq.com> Date: Wed, 8 Mar 2023 11:23:26 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E5=BE=AE=E4=BF=A1=E6=94=AF=E4=BB=98?= =?UTF-8?q?=E3=80=81=E6=94=AF=E4=BB=98=E5=AE=9D=E6=94=AF=E4=BB=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/zscat/mallplus/enums/AllEnum.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/mallplus-mbg/src/main/java/com/zscat/mallplus/enums/AllEnum.java b/mallplus-mbg/src/main/java/com/zscat/mallplus/enums/AllEnum.java index 1b76d62..8ed9a9e 100644 --- a/mallplus-mbg/src/main/java/com/zscat/mallplus/enums/AllEnum.java +++ b/mallplus-mbg/src/main/java/com/zscat/mallplus/enums/AllEnum.java @@ -232,11 +232,11 @@ public class AllEnum { /** * 微信小程序 */ - weixinAppletPay(1, "weixinAppletPay"), + weixinAppletPay(2, "weixinAppletPay"), /** * */ - alipay(2, "alipay"), + alipay(1, "alipay"), /** * 余额支付 */