From 7165c4f7729a2a565779935f58012eca860a3772 Mon Sep 17 00:00:00 2001
From: xuwenbo <717567226@qq.com>
Date: Thu, 30 Jul 2020 18:49:18 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8D=87=E7=BA=A7wxjava=E4=B8=BA=E6=9C=80?=
 =?UTF-8?q?=E6=96=B0=E7=89=88=E6=9C=AC=20=E6=96=B0=E5=A2=9E=E5=9C=B0?=
 =?UTF-8?q?=E5=9D=80=E5=A6=82=E6=9E=9C=E4=B8=BA=E9=BB=98=E8=AE=A4=EF=BC=8C?=
 =?UTF-8?q?=E6=8A=8A=E4=BB=A5=E5=89=8D=E5=9C=B0=E5=9D=80=E7=9A=84=E9=BB=98?=
 =?UTF-8?q?=E8=AE=A4=E7=8A=B6=E6=80=81=E6=8D=A2=E6=8E=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../user/service/impl/YxUserAddressServiceImpl.java   | 11 +++++++++++
 .../modules/services/WechatArticleService.java        |  7 ++-----
 yshop-weixin/pom.xml                                  |  2 +-
 3 files changed, 14 insertions(+), 6 deletions(-)

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<YxUserAddressMappe
                 .build();
         if("true".equals(param.getIs_default())){
             userAddress.setIsDefault(ShopCommonEnum.DEFAULT_1.getValue());
+            //新增地址如果是默认，把之前的状态改掉
+            List<YxUserAddress> userAddresss = this.list(new LambdaQueryWrapper<YxUserAddress>().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 @@
     <name>微信模块</name>
 
     <properties>
-        <weixin-java.version>3.6.0</weixin-java.version>
+        <weixin-java.version>3.8.0</weixin-java.version>
     </properties>
 
     <dependencies>