Browse Source

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

release_toaliyun_real
xhxu 2 years ago
parent
commit
beba2a976d
3 changed files with 11 additions and 1 deletions
  1. +2
    -0
      mallinkService/src/main/java/com/iformall/mapper/WxMerchantBUserMapper.java
  2. +5
    -1
      mallinkService/src/main/java/com/iformall/service/impl/WxMerchantServiceImpl.java
  3. +4
    -0
      mallinkService/src/main/resources/mapper/WxMerchantBUserMapper.xml

+ 2
- 0
mallinkService/src/main/java/com/iformall/mapper/WxMerchantBUserMapper.java View File

@@ -23,4 +23,6 @@ public interface WxMerchantBUserMapper extends CommonMapper<WxMerchantBUser, Lon
int deleteOtherMerchant(@Param("tenantId")String tenantId, @Param("otherId")String otherId);

int addOtherMerchant(@Param("tenantId")String tenantId, @Param("ids")List<Long> ids, @Param("otherId")String otherId);
void deleteByMerchantId(@Param("tenantId")String tenantId, @Param("merchantId")Long merchantId);
}

+ 5
- 1
mallinkService/src/main/java/com/iformall/service/impl/WxMerchantServiceImpl.java View File

@@ -767,7 +767,11 @@ public class WxMerchantServiceImpl implements WxMerchantService {
}
}
}

//删除店员
if(wxMerchant.getIsDel() != null && wxMerchant.getIsDel().equals(EnumDelStatus.DEL.getCode())) {
wxMerchantBUserMapper.deleteByMerchantId(wxMerchant.getTenantId(),wxMerchant.getId());
}
return new ResultData(Result.SUCCESS, "商户更新成功");
} catch (Exception e) {
logger.error("db failed: 商户更新失败, e:" + e.getMessage());


+ 4
- 0
mallinkService/src/main/resources/mapper/WxMerchantBUserMapper.xml View File

@@ -189,5 +189,9 @@
</foreach>
and json_search(other_merchant, 'one', #{otherId}) IS NULL;
</update>
<delete id="deleteByMerchantId">
delete from wx_merchant_b_user where `tenant_id` = #{tenantId} and `merchant_id` = #{merchantId}
</delete>

</mapper>

Loading…
Cancel
Save