换藏商品列表加上头像

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

@@ -18,10 +18,7 @@ import com.wwdz.ch.db.dao.exchange.ExchangeApplyOrderDao;
 import com.wwdz.ch.db.dao.exchange.ExchangeApplyOrderDetailDao;
 import com.wwdz.ch.db.domain.distribution.*;
 import com.wwdz.ch.db.dto.request.distribution.DistributionOrderRequestDto;
-import com.wwdz.ch.db.dto.request.distribution.GroupPurchaseRecordRequestDto;
 import com.wwdz.ch.db.dto.request.distribution.SupplierItemRequestDto;
-import com.wwdz.ch.wx.entity.GroupPurchaseInfo;
-import com.wwdz.ch.wx.entity.vo.distribution.DistributionOrderVo;
 import com.wwdz.ch.wx.entity.vo.distribution.ExchangeOrderDetailVo;
 import com.wwdz.ch.wx.entity.vo.distribution.ExchangeOrderVo;
 import com.wwdz.ch.wx.entity.vo.distribution.UserExchangeInfo;
@@ -68,7 +65,7 @@ public class ExchangeOrderServiceImpl implements ExchangeOrderService {
         try {
             //检查是否有超时未支付订单
             dto.setBuyerId(dto.getUserId());
-            checkPrePayTimeOut(dto.getUserId());
+            checkDeliveryTimeOut(dto.getUserId());
             if (StringUtils.hasLength(dto.getSearchParam())) {
                 //判断查询条件是否为中文，是的话就根据商品名称模糊查询
                 if (RegexUtil.isContainChinese(dto.getSearchParam())) {
@@ -164,7 +161,7 @@ public class ExchangeOrderServiceImpl implements ExchangeOrderService {
         try {
             dto.setBuyerId(dto.getUserId());
             //检查是否有超时未寄出的
-            checkPrePayTimeOut(dto.getUserId());
+            checkDeliveryTimeOut(dto.getUserId());
             DistributionOrder distributionOrder = distributionOrderDao.findById(dto.getDistributionOrderId());
             //用户交换得到的商品信息
             List<SupplierItemVo> targetItemList = new ArrayList<>();
@@ -235,7 +232,11 @@ public class ExchangeOrderServiceImpl implements ExchangeOrderService {
             }
             exchangeOrderDetailVo.setStateTitle(exchangeOrderDetailVo.getStateName());
             if (distributionOrder.getState() == DistributionEnum.DistributionOrderStateEnum.CANCEL.getCode()) {
+                if (exchangeApplyOrder.getState() == ExchangeApplyOrderEnum.StateEnum.SYSTEM_DISAGREE.getCode()) {
                     exchangeOrderDetailVo.setStateDesc("藏品检查不通过，订单取消，交换关闭。");
+                } else {
+                    exchangeOrderDetailVo.setStateDesc("超时未寄出，订单取消，交换关闭。");
+                }
             } else if (distributionOrder.getState() == DistributionEnum.DistributionOrderStateEnum.PRE_INSPECTION.getCode()) {
                 exchangeOrderDetailVo.setStateDesc("请耐心等待，平台收到货后会尽快检查");
             } else if (distributionOrder.getState() == DistributionEnum.DistributionOrderStateEnum.PRE_SEND.getCode()) {
@@ -260,7 +261,7 @@ public class ExchangeOrderServiceImpl implements ExchangeOrderService {
      * 检查用户订单是否有超时未寄出
      * @param userId
      */
-    private void checkPrePayTimeOut(Long userId){
+    private void checkDeliveryTimeOut(Long userId){
         DistributionOrderRequestDto dto = new DistributionOrderRequestDto();
         dto.setBuyerId(userId);
         dto.setType(DistributionEnum.DistributionTypeEnum.EXCHANGE.getCode());