Merge branch 'master-auto-pay' into base-modify

ace-modules/ace-admin/src/main/java/com/github/wxiaoqi/security/admin/biz/AppUserAlipayBiz.java

 package com.github.wxiaoqi.security.admin.biz;
 
+import cn.hutool.core.bean.BeanUtil;
+import cn.hutool.core.bean.copier.CopyOptions;
 import com.alibaba.fastjson.JSONObject;
 import com.github.wxiaoqi.security.admin.entity.AppUserAlipay;
 import com.github.wxiaoqi.security.admin.entity.AppUserLogin;
@@ -20,6 +22,7 @@ import org.springframework.stereotype.Service;
 import tk.mybatis.mapper.entity.Example;
 
 import javax.servlet.http.HttpServletRequest;
+import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;
 
@@ -70,7 +73,7 @@ public class AppUserAlipayBiz extends BaseBiz<AppUserAlipayMapper, AppUserAlipay
 
 
     //获取支付宝用户信息
-    public AppUserAlipay getByUserId(HttpServletRequest request){
+    public List<AppUserAlipay> getByUserId(HttpServletRequest request){
         Example example=new Example(AppUserAlipay.class);
         try {
             String username = userAuthUtil.getInfoFromToken(userAuthConfig.getToken(request)).getId();
@@ -81,7 +84,24 @@ public class AppUserAlipayBiz extends BaseBiz<AppUserAlipayMapper, AppUserAlipay
             e.printStackTrace();
         }
         example.setOrderByClause("is_default desc");
-        return mapper.selectOneByExample(example);
+        AppUserAlipay appUserAlipay = mapper.selectOneByExample(example);
+        List<AppUserAlipay> appUserAlipays = new ArrayList<>();
+        appUserAlipays.add(appUserAlipay);
+        return appUserAlipays;
+    }
+
+    public void  save(AppUserAlipay appUserAlipay) {
+        Example example=new Example(AppUserAlipay.class);
+        example.createCriteria().andEqualTo("userId", appUserAlipay.getUserId()).andEqualTo("isDel",0);
+        example.setOrderByClause("is_default desc");
+        AppUserAlipay oldValue = mapper.selectOneByExample(example);
+        if (oldValue != null) {
+            BeanUtil.copyProperties(appUserAlipay, oldValue, CopyOptions.create().setIgnoreNullValue(true).setIgnoreError(true));
+            updateByIdRe(oldValue);
+        } else {
+            insertSelectiveRe(appUserAlipay);
+        }
+
     }
 
     /**
@@ -122,7 +142,7 @@ public class AppUserAlipayBiz extends BaseBiz<AppUserAlipayMapper, AppUserAlipay
                     appUserAlipay.setNickname(nickname);
                 }
                 log.info("用户支付宝信息： {}", appUserAlipay.toString());
-                insertSelectiveRe(appUserAlipay);
+                save(appUserAlipay);
                 return ObjectRestResponse.succ();
             } else {
                 return ObjectRestResponse.createFailedResult(Integer.parseInt(jsonObject.getJSONObject("error_response").getString("code")), jsonObject.getJSONObject("error_response").getString("sub_msg"));