修改支付信息

rs-website/rs-website-server/src/main/java/com/upyuns/platform/rs/website/biz/UserAddressBiz.java

@@ -93,7 +93,7 @@ public class UserAddressBiz extends BaseBiz<UserAddressMapper, UserAddress> {
 	 *
 	 * @return
 	 */
-	public ObjectRestResponse getUserAddress(UserAddressDto userAddressDto) {
+	public ObjectRestResponse<PageDataVO<UserAddress>> getUserAddress(UserAddressDto userAddressDto) {
 		AppUserDTO appUserVo = userFeign.userDetailByToken(request.getHeader("Authorization")).getData();
 		if (appUserVo == null) {
 			return ObjectRestResponse.createFailedResult(ResultCode.RSTOKEN_EXPIRED_CODE, ResultCode.getMsg(ResultCode.RSTOKEN_EXPIRED_CODE));

rs-website/rs-website-server/src/main/java/com/upyuns/platform/rs/website/biz/UserInvoiceBiz.java

@@ -104,7 +104,7 @@ public class UserInvoiceBiz extends BaseBiz<UserInvoiceMapper,UserInvoice> {
 	 * @param userInvoiceDto
 	 * @return
 	 */
-	public ObjectRestResponse getList(UserInvoiceDto userInvoiceDto) {
+	public ObjectRestResponse<PageDataVO<UserInvoice>> getList(UserInvoiceDto userInvoiceDto) {
 		Example example = new Example(UserInvoice.class);
 		Example.Criteria criteria = example.createCriteria();
 		if (userInvoiceDto.getUserId() != null) {
@@ -131,7 +131,7 @@ public class UserInvoiceBiz extends BaseBiz<UserInvoiceMapper,UserInvoice> {
 	 * @param userInvoiceDto
 	 * @return
 	 */
-	public ObjectRestResponse getUserInvoiceInfo(UserInvoiceDto userInvoiceDto) {
+	public ObjectRestResponse<PageDataVO<UserInvoice>> getUserInvoiceInfo(UserInvoiceDto userInvoiceDto) {
 		AppUserDTO appUserDTO = userFeign.userDetailByToken(request.getHeader("Authorization")).getData();
 		if (appUserDTO == null) {
 			return ObjectRestResponse.createFailedResult(ResultCode.RSTOKEN_EXPIRED_CODE, ResultCode.getMsg(ResultCode.RSTOKEN_EXPIRED_CODE));

rs-website/rs-website-server/src/main/java/com/upyuns/platform/rs/website/service/ConfirmOrderService.java

@@ -4,15 +4,11 @@ import com.github.wxiaoqi.security.common.msg.ObjectRestResponse;
 import com.upyuns.platform.rs.universal.constant.DictionaryKey;
 import com.upyuns.platform.rs.universal.entity.Dictionary;
 import com.upyuns.platform.rs.universal.feign.ThirdFeign;
-import com.upyuns.platform.rs.website.biz.ImageImgStorageBiz;
-import com.upyuns.platform.rs.website.biz.ImageInfoRelationBiz;
-import com.upyuns.platform.rs.website.biz.IndustryApplicationInfoBiz;
-import com.upyuns.platform.rs.website.biz.ShoppingCartInfoBiz;
+import com.upyuns.platform.rs.website.biz.*;
 import com.upyuns.platform.rs.website.dto.ConfirmOrderDto;
-import com.upyuns.platform.rs.website.entity.ImageImgStorage;
-import com.upyuns.platform.rs.website.entity.ImageInfoRelation;
-import com.upyuns.platform.rs.website.entity.IndustryApplicationInfo;
-import com.upyuns.platform.rs.website.entity.ShoppingCartInfo;
+import com.upyuns.platform.rs.website.dto.UserAddressDto;
+import com.upyuns.platform.rs.website.dto.UserInvoiceDto;
+import com.upyuns.platform.rs.website.entity.*;
 import com.upyuns.platform.rs.website.type.OrderTypeEnum;
 import com.upyuns.platform.rs.website.vo.ConfirmOrderInfoVo;
 import lombok.extern.slf4j.Slf4j;
@@ -52,6 +48,12 @@ public class ConfirmOrderService {
 	@Autowired
 	ThirdFeign thirdFeign;
 
+	@Autowired
+	UserAddressBiz userAddressBiz;
+
+	@Autowired
+	UserInvoiceBiz userInvoiceBiz;
+
 	/**
 	 * 确认订单
 	 * @param confirmOrderDto
@@ -120,6 +122,24 @@ public class ConfirmOrderService {
 		if (dictionary != null && StringUtils.isBlank(dictionary.getDetail())) {
 			confirmOrderInfoVo.setFee(new BigDecimal(dictionary.getDetail()));
 		}
+		try {
+			List<UserAddress> userAddressList = userAddressBiz.getUserAddress(new UserAddressDto(){{setPage(1); setLimit(Integer.MAX_VALUE);}}).getData().getData();
+			if (userAddressList != null && userAddressList.size() > 0) {
+				confirmOrderInfoVo.setUserAddressList(userAddressList);
+			}
+		} catch (Exception e) {
+			log.error("用户地址信息错误: {}", e);
+		}
+
+		try {
+			List<UserInvoice> userInvoiceList = userInvoiceBiz.getUserInvoiceInfo(new UserInvoiceDto(){{setPage(1); setLimit(Integer.MAX_VALUE);}}).getData().getData();
+			if (userInvoiceList != null && userInvoiceList.size() > 0) {
+				confirmOrderInfoVo.setUserInvoiceList(userInvoiceList);
+			}
+		} catch (Exception e) {
+			log.error("用户发票信息错误: {}", e);
+		}
+
 		return ObjectRestResponse.succ(confirmOrderInfoVo);
 	}