|
@@ -19,11 +19,10 @@ import com.fjhx.kd100.service.company.CompanyInfoService;
|
|
|
import com.fjhx.kd100.util.KD100Util;
|
|
|
import com.fjhx.victoriatourist.entity.jd.dto.JdBackDto;
|
|
|
import com.fjhx.victoriatourist.entity.jd.dto.JdBackSelectDto;
|
|
|
-import com.fjhx.victoriatourist.entity.jd.po.JdBack;
|
|
|
-import com.fjhx.victoriatourist.entity.jd.po.JdBackDetails;
|
|
|
-import com.fjhx.victoriatourist.entity.jd.po.JdBackQualityWait;
|
|
|
-import com.fjhx.victoriatourist.entity.jd.po.JdOrder;
|
|
|
+import com.fjhx.victoriatourist.entity.jd.po.*;
|
|
|
+import com.fjhx.victoriatourist.entity.jd.vo.JdBackDetailsVo;
|
|
|
import com.fjhx.victoriatourist.entity.jd.vo.JdBackVo;
|
|
|
+import com.fjhx.victoriatourist.entity.jd.vo.JdOrderDetailsVo;
|
|
|
import com.fjhx.victoriatourist.entity.logistics.po.LogisticsInfos;
|
|
|
import com.fjhx.victoriatourist.mapper.jd.JdBackMapper;
|
|
|
import com.fjhx.victoriatourist.service.jd.JdBackDetailsService;
|
|
@@ -122,6 +121,15 @@ public class JdBackServiceImpl extends ServiceImpl<JdBackMapper, JdBack> impleme
|
|
|
}
|
|
|
//赋值退货明细
|
|
|
List<JdBackDetails> jdBackDetailsList = jdBackDetailsService.list(q -> q.eq(JdBackDetails::getJdBackId, id));
|
|
|
+
|
|
|
+ List<JdBackDetailsVo> jdBackDetailsVoList = BeanUtil.copyToList(jdBackDetailsList, JdBackDetailsVo.class);
|
|
|
+
|
|
|
+ productInfoService.attributeAssign(jdBackDetailsVoList, JdBackDetails::getProductId, (item, product) -> {
|
|
|
+ item.setProductCode(product.getCode());
|
|
|
+ item.setProductName(product.getName());
|
|
|
+ item.setProductCustomCode(product.getCustomCode());
|
|
|
+ });
|
|
|
+
|
|
|
result.setJdBackDetailsList(jdBackDetailsList);
|
|
|
return result;
|
|
|
}
|