Kaynağa Gözat

fix mall

release_toaliyun_real
lin 3 yıl önce
ebeveyn
işleme
ac1239c6df
4 değiştirilmiş dosya ile 8 ekleme ve 1 silme
  1. +2
    -0
      mallinkAdmin/src/main/resources/db/migration/V2023042600001_mall.sql
  2. +3
    -0
      mallinkService/src/main/java/com/iformall/domain/po/WxMall.java
  3. +1
    -0
      mallinkService/src/main/java/com/iformall/service/impl/WxPayOrderServiceImpl.java
  4. +2
    -1
      mallinkService/src/main/resources/mapper/WxMallMapper.xml

+ 2
- 0
mallinkAdmin/src/main/resources/db/migration/V2023042600001_mall.sql Dosyayı Görüntüle

@@ -0,0 +1,2 @@
alter table wx_mall add column use_card_by_search_phone int(1) NOT NULL DEFAULT 0 COMMENT '是否支持商户根据手机号查询使用卡';


+ 3
- 0
mallinkService/src/main/java/com/iformall/domain/po/WxMall.java Dosyayı Görüntüle

@@ -97,6 +97,9 @@ public class WxMall extends TenantEntity {
private String alipayAppAuthToken; private String alipayAppAuthToken;
@io.swagger.annotations.ApiModelProperty(value="支付宝app authToken,永久有效",name="alipayAppAuthToken") @io.swagger.annotations.ApiModelProperty(value="支付宝app authToken,永久有效",name="alipayAppAuthToken")
private String alipayMemberTemplateId; private String alipayMemberTemplateId;
@io.swagger.annotations.ApiModelProperty(value="是否支持商户根据手机号查询使用卡",name="useCardBySearchPhone")
private Integer useCardBySearchPhone;




@TableField(exist = false) @TableField(exist = false)


+ 1
- 0
mallinkService/src/main/java/com/iformall/service/impl/WxPayOrderServiceImpl.java Dosyayı Görüntüle

@@ -217,6 +217,7 @@ public class WxPayOrderServiceImpl implements WxPayOrderService {
} }
} }
//不要事务,出错更新
@Transactional(propagation = Propagation.NOT_SUPPORTED,noRollbackFor = {Exception.class}) @Transactional(propagation = Propagation.NOT_SUPPORTED,noRollbackFor = {Exception.class})
public boolean handelPress(WxCoupon coupon,WxOrder order) { public boolean handelPress(WxCoupon coupon,WxOrder order) {
//如果是砍价,并且是付款扣库存 //如果是砍价,并且是付款扣库存


+ 2
- 1
mallinkService/src/main/resources/mapper/WxMallMapper.xml Dosyayı Görüntüle

@@ -37,6 +37,7 @@
<result column="default_sign" jdbcType="INTEGER" property="defaultSign"/> <result column="default_sign" jdbcType="INTEGER" property="defaultSign"/>
<result column="group_support" jdbcType="INTEGER" property="groupSupport"/> <result column="group_support" jdbcType="INTEGER" property="groupSupport"/>
<result column="live_support" jdbcType="INTEGER" property="liveSupport"/> <result column="live_support" jdbcType="INTEGER" property="liveSupport"/>
<result column="use_card_by_search_phone" jdbcType="INTEGER" property="useCardBySearchPhone"/>




<result column="cash_out_support" jdbcType="INTEGER" property="cashOutSupport"/> <result column="cash_out_support" jdbcType="INTEGER" property="cashOutSupport"/>
@@ -59,7 +60,7 @@
`img_url`,`img_url_h`, `weap_note`, `img_qrcode_weapp`, `img_qrcode_wemp`, `img_url`,`img_url_h`, `weap_note`, `img_qrcode_weapp`, `img_qrcode_wemp`,
`weapp_share_title`,`weapp_share_cover_img`, `pos_qrcode_rule`, `weapp_share_title`,`weapp_share_cover_img`, `pos_qrcode_rule`,
`sale_type`, `valid_start`, `valid_end`,`business_hours`,`introduction`,`img`, `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` `cash_out_support`,`cash_out_limit`,`alipay_app_auth_token`,`alipay_member_template_id`
</sql> </sql>




Yükleniyor…
İptal
Kaydet