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"), /** * 余额支付 */ 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"; 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)) {