diff --git a/yshop-mall/src/main/java/co/yixiang/modules/user/service/impl/YxUserAddressServiceImpl.java b/yshop-mall/src/main/java/co/yixiang/modules/user/service/impl/YxUserAddressServiceImpl.java index a0141139..e9a2b239 100644 --- a/yshop-mall/src/main/java/co/yixiang/modules/user/service/impl/YxUserAddressServiceImpl.java +++ b/yshop-mall/src/main/java/co/yixiang/modules/user/service/impl/YxUserAddressServiceImpl.java @@ -9,6 +9,8 @@ package co.yixiang.modules.user.service.impl; +import cn.hutool.Hutool; +import cn.hutool.core.collection.CollectionUtil; import cn.hutool.core.util.StrUtil; import co.yixiang.common.service.impl.BaseServiceImpl; import co.yixiang.dozer.service.IGenerator; @@ -18,6 +20,7 @@ import co.yixiang.modules.user.param.AddressParam; import co.yixiang.modules.user.service.YxUserAddressService; import co.yixiang.modules.user.service.mapper.YxUserAddressMapper; import co.yixiang.modules.user.vo.YxUserAddressQueryVo; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; @@ -84,6 +87,14 @@ public class YxUserAddressServiceImpl extends BaseServiceImpl userAddresss = this.list(new LambdaQueryWrapper().eq(YxUserAddress::getIsDefault,ShopCommonEnum.DEFAULT_1.getValue())); + if(CollectionUtil.isNotEmpty(userAddresss)){ + userAddresss.forEach(i ->{ + i.setIsDefault(ShopCommonEnum.DEFAULT_0.getValue()); + }); + this.saveOrUpdateBatch(userAddresss); + } }else{ userAddress.setIsDefault(ShopCommonEnum.DEFAULT_0.getValue()); } diff --git a/yshop-shop/src/main/java/co/yixiang/modules/services/WechatArticleService.java b/yshop-shop/src/main/java/co/yixiang/modules/services/WechatArticleService.java index 2311a73d..88dbb906 100644 --- a/yshop-shop/src/main/java/co/yixiang/modules/services/WechatArticleService.java +++ b/yshop-shop/src/main/java/co/yixiang/modules/services/WechatArticleService.java @@ -12,10 +12,7 @@ import me.chanjar.weixin.common.api.WxConsts; import me.chanjar.weixin.common.error.WxErrorException; import me.chanjar.weixin.mp.api.WxMpService; import me.chanjar.weixin.mp.bean.WxMpMassTagMessage; -import me.chanjar.weixin.mp.bean.material.WxMediaImgUploadResult; -import me.chanjar.weixin.mp.bean.material.WxMpMaterial; -import me.chanjar.weixin.mp.bean.material.WxMpMaterialNews; -import me.chanjar.weixin.mp.bean.material.WxMpMaterialUploadResult; +import me.chanjar.weixin.mp.bean.material.*; import me.chanjar.weixin.mp.bean.result.WxMpMassSendResult; import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Value; @@ -47,7 +44,7 @@ public class WechatArticleService { WxMpMaterialNews wxMpMaterialNews = new WxMpMaterialNews(); - WxMpMaterialNews.WxMpMaterialNewsArticle article = new WxMpMaterialNews.WxMpMaterialNewsArticle(); + WxMpNewsArticle article = new WxMpNewsArticle(); WxMpMaterialUploadResult wxMpMaterialUploadResult = uploadPhotoToWx( wxMpService, wxNewsArticleItem.getImageInput() ); diff --git a/yshop-weixin/pom.xml b/yshop-weixin/pom.xml index daafa4ec..ccbf78bb 100644 --- a/yshop-weixin/pom.xml +++ b/yshop-weixin/pom.xml @@ -13,7 +13,7 @@ 微信模块 - 3.6.0 + 3.8.0