From ac1239c6dfa43c1d6897017e06799120e03a0b72 Mon Sep 17 00:00:00 2001 From: lin <642018748@qq.com> Date: Mon, 17 Apr 2023 15:02:05 +0800 Subject: [PATCH] fix mall --- .../src/main/resources/db/migration/V2023042600001_mall.sql | 2 ++ .../src/main/java/com/iformall/domain/po/WxMall.java | 3 +++ .../java/com/iformall/service/impl/WxPayOrderServiceImpl.java | 1 + mallinkService/src/main/resources/mapper/WxMallMapper.xml | 3 ++- 4 files changed, 8 insertions(+), 1 deletion(-) create mode 100644 mallinkAdmin/src/main/resources/db/migration/V2023042600001_mall.sql diff --git a/mallinkAdmin/src/main/resources/db/migration/V2023042600001_mall.sql b/mallinkAdmin/src/main/resources/db/migration/V2023042600001_mall.sql new file mode 100644 index 000000000..4920af220 --- /dev/null +++ b/mallinkAdmin/src/main/resources/db/migration/V2023042600001_mall.sql @@ -0,0 +1,2 @@ +alter table wx_mall add column use_card_by_search_phone int(1) NOT NULL DEFAULT 0 COMMENT '是否支持商户根据手机号查询使用卡'; + diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxMall.java b/mallinkService/src/main/java/com/iformall/domain/po/WxMall.java index 1ba3373d5..cd6b84685 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxMall.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxMall.java @@ -97,6 +97,9 @@ public class WxMall extends TenantEntity { private String alipayAppAuthToken; @io.swagger.annotations.ApiModelProperty(value="支付宝app authToken,永久有效",name="alipayAppAuthToken") private String alipayMemberTemplateId; + + @io.swagger.annotations.ApiModelProperty(value="是否支持商户根据手机号查询使用卡",name="useCardBySearchPhone") + private Integer useCardBySearchPhone; @TableField(exist = false) 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 a57c8cba5..2080ab2d2 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxPayOrderServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxPayOrderServiceImpl.java @@ -217,6 +217,7 @@ public class WxPayOrderServiceImpl implements WxPayOrderService { } } + //不要事务,出错更新 @Transactional(propagation = Propagation.NOT_SUPPORTED,noRollbackFor = {Exception.class}) public boolean handelPress(WxCoupon coupon,WxOrder order) { //如果是砍价,并且是付款扣库存 diff --git a/mallinkService/src/main/resources/mapper/WxMallMapper.xml b/mallinkService/src/main/resources/mapper/WxMallMapper.xml index c5f0e374d..e72ec8cba 100644 --- a/mallinkService/src/main/resources/mapper/WxMallMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxMallMapper.xml @@ -37,6 +37,7 @@ + @@ -59,7 +60,7 @@ `img_url`,`img_url_h`, `weap_note`, `img_qrcode_weapp`, `img_qrcode_wemp`, `weapp_share_title`,`weapp_share_cover_img`, `pos_qrcode_rule`, `sale_type`, `valid_start`, `valid_end`,`business_hours`,`introduction`,`img`, - `latitude`,`longitude`,`default_sign`,`group_support`,`live_support`, + `latitude`,`longitude`,`default_sign`,`group_support`,`live_support`,`use_card_by_search_phone`, `cash_out_support`,`cash_out_limit`,`alipay_app_auth_token`,`alipay_member_template_id`