|
|
@@ -3,12 +3,16 @@ package com.xingxi.api.service.impl;
|
|
|
import cn.binarywang.wx.miniapp.api.WxMaService;
|
|
|
import cn.binarywang.wx.miniapp.api.WxMaUserService;
|
|
|
import cn.binarywang.wx.miniapp.bean.WxMaUserInfo;
|
|
|
+import com.xingxi.api.data.mapper.WxApiUserAddressMapper;
|
|
|
import com.xingxi.api.model.*;
|
|
|
import com.xingxi.business.UserAddress.domain.UserAddress;
|
|
|
import com.xingxi.business.UserAddress.mapper.UserAddressMapper;
|
|
|
import com.xingxi.common.aliyun.oss.AliyunOSSClient;
|
|
|
+import com.xingxi.common.annotation.Excel;
|
|
|
import com.xingxi.common.core.domain.entity.SysUser;
|
|
|
import com.xingxi.common.enums.EDelFlag;
|
|
|
+import com.xingxi.common.enums.EYesNo;
|
|
|
+import com.xingxi.common.utils.StringUtils;
|
|
|
import com.xingxi.common.utils.spring.SpringUtils;
|
|
|
import com.xingxi.common.utils.uuid.IdUtils;
|
|
|
import com.xingxi.api.common.UserContext;
|
|
|
@@ -26,6 +30,7 @@ import sun.misc.BASE64Decoder;
|
|
|
import javax.validation.constraints.NotBlank;
|
|
|
import javax.validation.constraints.NotNull;
|
|
|
import java.io.ByteArrayInputStream;
|
|
|
+import java.util.ArrayList;
|
|
|
import java.util.Date;
|
|
|
import java.util.List;
|
|
|
|
|
|
@@ -34,7 +39,7 @@ import java.util.List;
|
|
|
@Service
|
|
|
@Validated
|
|
|
class UserProfileServiceImpl implements UserProfileServiceI {
|
|
|
- private final UserAddressMapper userAddressMapper;
|
|
|
+ private final WxApiUserAddressMapper userAddressMapper;
|
|
|
@NotBlank
|
|
|
@Value("${aliyun.oss.customDomain}")
|
|
|
private String customDomain;
|
|
|
@@ -205,4 +210,38 @@ class UserProfileServiceImpl implements UserProfileServiceI {
|
|
|
return new UserAddressListResponse(userAddressList);
|
|
|
}
|
|
|
|
|
|
+ @Override
|
|
|
+ public UserAddressListResponse saveAddress(UserContext userContext, UserAddressRequest request) {
|
|
|
+
|
|
|
+ if (EYesNo.YES.getVal().equals(request.getDefaultFlag())) {
|
|
|
+ userAddressMapper.clearDefaultFlag(request.getUserId());
|
|
|
+ }
|
|
|
+
|
|
|
+ UserAddress userAddress = new UserAddress();
|
|
|
+
|
|
|
+ userAddress.setUserAddressId(request.getUserAddressId());
|
|
|
+ userAddress.setUserId(request.getUserId());
|
|
|
+ userAddress.setMobile(request.getMobile());
|
|
|
+ userAddress.setRecipient(request.getRecipient());
|
|
|
+ userAddress.setProvince(request.getProvince());
|
|
|
+ userAddress.setCity(request.getCity());
|
|
|
+ userAddress.setDistrict(request.getDistrict());
|
|
|
+ userAddress.setAddress(request.getAddress());
|
|
|
+ userAddress.setDelFlag(request.getDefaultFlag());
|
|
|
+ userAddress.setDelFlag(EDelFlag.NO.getVal());
|
|
|
+ if (request.getUserAddressId() == null || request.getUserAddressId() == 0L) {
|
|
|
+ userAddressMapper.insertUserAddress(userAddress);
|
|
|
+ } else {
|
|
|
+ userAddressMapper.updateUserAddress(userAddress);
|
|
|
+ }
|
|
|
+
|
|
|
+ UserAddress condAddress = new UserAddress();
|
|
|
+ condAddress.setUserId(userContext.getCurrentUser().getUserId());
|
|
|
+ condAddress.setDelFlag(EDelFlag.NO.getVal());
|
|
|
+
|
|
|
+ List<UserAddress> userAddressList = userAddressMapper.selectUserAddressList(condAddress);
|
|
|
+
|
|
|
+ return new UserAddressListResponse(userAddressList);
|
|
|
+ }
|
|
|
+
|
|
|
}
|