Bläddra i källkod

Merge branch 'release_real_202103' of https://git.malls.iformall.com/server/formallProject into release_real_202103

release_toaliyun_real
xiaohanzi 5 år sedan
förälder
incheckning
475a22ef2a
2 ändrade filer med 4 tillägg och 1 borttagningar
  1. +3
    -0
      mallinkAdmin/src/main/resources/db/migration/V202105270001__tt_add_.sql
  2. +1
    -1
      mallinkService/src/main/java/com/iformall/service/impl/WxMerchantServiceImpl.java

+ 3
- 0
mallinkAdmin/src/main/resources/db/migration/V202105270001__tt_add_.sql Visa fil

@@ -14,3 +14,6 @@ UPDATE wx_merchant SET entry_amount = 0 ;

ALTER TABLE `wx_merchant`
ADD COLUMN `mark_time` datetime(0) COMMENT '记号时间' AFTER `mark`;

ALTER TABLE `mall_user_info`
ADD COLUMN `merchant_id` bigint(20) AFTER `email`;

+ 1
- 1
mallinkService/src/main/java/com/iformall/service/impl/WxMerchantServiceImpl.java Visa fil

@@ -1128,7 +1128,7 @@ public class WxMerchantServiceImpl implements WxMerchantService {
@Override
public ResultData ttstartusing(Long id) {
WxMerchant wxMerchant = wxMerchantMapper.selectById(id);
if (wxMerchant == null || wxMerchant.getStatus().equals(EnumYesOrNo.NO.getCode())) {
if (wxMerchant == null || wxMerchant.getStatus().equals(EnumYesOrNo.YES.getCode())) {
return new ResultData(ErrorCode.SYS_PARAMETER_ERROR,"作者信息未找到或者已启用");
}
WxMerchant disableMerchant = new WxMerchant();


Laddar…
Avbryt
Spara