详情返回退货收货地址

ch-core/src/main/java/com/wwdz/ch/core/entity/ConsignSaleRecordVo.java

@@ -63,4 +63,14 @@ public class ConsignSaleRecordVo implements Entity {
      */
     private Integer agreed;
 
+    /**
+     * 退货收货地址
+     */
+    private Long addressId;
+
+    /**
+     * 退货收货地址
+     */
+    private String returnAddress;
+
 }

ch-wx-api/src/main/java/com/wwdz/ch/wx/entity/vo/ConsignSaleAppletVo.java

@@ -83,6 +83,16 @@ public class ConsignSaleAppletVo implements Entity {
      */
     private List<AppletStateNodeVo> nodeVoList;
 
+    /**
+     * 退货收货地址
+     */
+    private Long addressId;
+
+    /**
+     * 退货收货地址
+     */
+    private String returnAddress;
+
 
 
 }

ch-wx-api/src/main/java/com/wwdz/ch/wx/impl/ConsignSaleServiceImpl.java

@@ -21,6 +21,9 @@ import com.wwdz.ch.wx.entity.vo.AppletStateNodeVo;
 import com.wwdz.ch.wx.entity.vo.ConsignSaleAppletVo;
 import com.wwdz.ch.wx.service.ConsignSaleService;
 import com.wwdz.ch.wx.service.ReturnOrderService;
+import com.wwdz.mall.common.vo.response.CloudServerResponse;
+import com.wwdz.user.api.dto.res.address.UserAddressDTO;
+import com.wwdz.user.api.service.address.UserAddressReadService;
 import com.wwdz.user.api.service.user.UserReadService;
 import com.xxdxxs.utils.DateUtils;
 import com.xxdxxs.utils.EntityMapper;
@@ -66,6 +69,9 @@ public class ConsignSaleServiceImpl implements ConsignSaleService {
     @Autowired
     ReturnOrderRecordDao returnOrderRecordDao;
 
+    @Reference
+    UserAddressReadService userAddressReadService;
+
 
     @Override
     public Result createConsignSaleOrder(ConsignSaleRequestDto dto) {
@@ -235,6 +241,8 @@ public class ConsignSaleServiceImpl implements ConsignSaleService {
             long itemId = consignSale.getItemId();
             Item item = itemDao.findById(itemId);
 
+
+
             consignSaleAppletVo.setSaleId(saleId);
             consignSaleAppletVo.setHomePageImage(MediaUtil.getHomePageImage(item.getImages(), item.getVideos()));
             consignSaleAppletVo.setItemName(item.getName());
@@ -402,6 +410,23 @@ public class ConsignSaleServiceImpl implements ConsignSaleService {
             long itemId = consignSale.getItemId();
             Item item = itemDao.findById(itemId);
             ConsignSaleRecordVo consignSaleRecordVo = new ConsignSaleRecordVo();
+
+            if (!ObjectUtils.isEmpty(consignSale.getAddressId())) {
+                consignSaleRecordVo.setAddressId(consignSale.getAddressId());
+                //查询id对应地址
+                CloudServerResponse<UserAddressDTO> cloudServerResponse = userAddressReadService.getAddressByAddressId(consignSale.getAddressId());
+                //成功的code = 1001
+                if (cloudServerResponse.getCode() == 1001 && cloudServerResponse.getResult() != null) {
+                    UserAddressDTO userAddressDTO = cloudServerResponse.getResult();
+                    StringBuffer stringBuffer = new StringBuffer();
+                    stringBuffer.append(userAddressDTO.getUserName());
+                    stringBuffer.append("," + userAddressDTO.getUserPhone());
+                    stringBuffer.append("," + userAddressDTO.getArea());
+                    stringBuffer.append("," + userAddressDTO.getAddress());
+                    consignSaleRecordVo.setReturnAddress(stringBuffer.toString());
+                }
+            }
+
             consignSaleRecordVo.setHomePageImage(MediaUtil.getHomePageImage(item.getImages(), item.getVideos()));
             consignSaleRecordVo.setItemName(item.getName());
             consignSaleRecordVo.setCustomState(consignSale.getCustomState());
@@ -579,6 +604,7 @@ public class ConsignSaleServiceImpl implements ConsignSaleService {
                 consignSale.setSaleId(dto.getSaleId());
                 consignSale.setCustomState(ConsignSaleEnum.SaleForUserStateEnum.CANCEL.getCode());
                 consignSale.setSystemState(ConsignSaleEnum.SaleForSysStateEnum.CANCEL.getCode());
+                consignSale.setAddressId(dto.getAddressId());
                 consignSaleDao.update(consignSale);
                 //商品下架
                 ConsignSale consignSaleInfo = consignSaleDao.findById(dto.getSaleId());