|
@@ -24,6 +24,7 @@ import com.fjhx.victoriatourist.entity.jd.po.JdOrder;
|
|
|
import com.fjhx.victoriatourist.entity.jd.po.JdOrderDetails;
|
|
|
import com.fjhx.victoriatourist.entity.jd.vo.JdOrderDetailsVo;
|
|
|
import com.fjhx.victoriatourist.entity.jd.vo.JdOrderVo;
|
|
|
+import com.fjhx.victoriatourist.entity.jd.vo.TellBackOrderVO;
|
|
|
import com.fjhx.victoriatourist.entity.logistics.po.LogisticsDetails;
|
|
|
import com.fjhx.victoriatourist.entity.logistics.po.LogisticsInfos;
|
|
|
import com.fjhx.victoriatourist.entity.logistics.vo.LogisticsInfosVo;
|
|
@@ -32,6 +33,7 @@ import com.fjhx.victoriatourist.entity.stock.po.StockTransfer;
|
|
|
import com.fjhx.victoriatourist.entity.stock.po.StockTransferDetails;
|
|
|
import com.fjhx.victoriatourist.mapper.jd.JdOrderMapper;
|
|
|
import com.fjhx.victoriatourist.service.abnormal.AbnormalInfoService;
|
|
|
+import com.fjhx.victoriatourist.service.jd.JdApiService;
|
|
|
import com.fjhx.victoriatourist.service.jd.JdOrderDetailsService;
|
|
|
import com.fjhx.victoriatourist.service.jd.JdOrderService;
|
|
|
import com.fjhx.victoriatourist.service.logistics.LogisticsDetailsService;
|
|
@@ -52,8 +54,11 @@ import com.ruoyi.system.service.ISysRoleService;
|
|
|
import com.ruoyi.system.utils.UserUtil;
|
|
|
import org.springframework.beans.factory.annotation.Autowired;
|
|
|
import org.springframework.stereotype.Service;
|
|
|
+import org.springframework.transaction.annotation.Transactional;
|
|
|
+import org.springframework.web.bind.annotation.RequestBody;
|
|
|
import org.springframework.web.multipart.MultipartFile;
|
|
|
|
|
|
+import javax.annotation.Resource;
|
|
|
import java.math.BigDecimal;
|
|
|
import java.util.*;
|
|
|
import java.util.function.Function;
|
|
@@ -104,6 +109,10 @@ public class JdOrderServiceImpl extends ServiceImpl<JdOrderMapper, JdOrder> impl
|
|
|
private ISysRoleService sysRoleService;
|
|
|
@Autowired
|
|
|
private CompanyInfoService companyInfoService;
|
|
|
+ @Resource
|
|
|
+ private JdApiService jdApiService;
|
|
|
+
|
|
|
+
|
|
|
|
|
|
@Override
|
|
|
public Page<JdOrderVo> getPage(JdOrderSelectDto dto) {
|
|
@@ -654,4 +663,28 @@ public class JdOrderServiceImpl extends ServiceImpl<JdOrderMapper, JdOrder> impl
|
|
|
.set(JdOrder::getBusinessStatus, jdOrderDto.getBusinessStatus())
|
|
|
.eq(JdOrder::getId,jdOrderDto.getId()).update();
|
|
|
}
|
|
|
+
|
|
|
+ @Override
|
|
|
+ @Transactional(rollbackFor = Exception.class)
|
|
|
+ public void tellBackOrer(JdOrderDto jdOrderDto) {
|
|
|
+ TellBackOrderVO tellBackOrderVO = new TellBackOrderVO();
|
|
|
+ tellBackOrderVO.setOrderId(jdOrderDto.getId());
|
|
|
+ tellBackOrderVO.setDeliveryTime(new Date());
|
|
|
+ List<TellBackOrderVO.BackInfo> backInfos = BeanUtil.copyToList(jdOrderDto.getJdOrderDetailsList(), TellBackOrderVO.BackInfo.class);
|
|
|
+ tellBackOrderVO.setBackInfo(backInfos);
|
|
|
+// jdApiService.tellBackOrer(tellBackOrderVO);
|
|
|
+ //修改订单状态
|
|
|
+ lambdaUpdate()
|
|
|
+ .set(JdOrder::getBusinessStatus, 2)
|
|
|
+ .eq(JdOrder::getId,jdOrderDto.getId()).update();
|
|
|
+ //修改明细信息
|
|
|
+ List<JdOrderDetails> jdOrderDetailsList = jdOrderDto.getJdOrderDetailsList();
|
|
|
+ for (JdOrderDetails jdOrderDetails : jdOrderDetailsList) {
|
|
|
+ jdOrderDetailsService.lambdaUpdate()
|
|
|
+ .set(JdOrderDetails::getConfirmNum,jdOrderDetails.getConfirmNum())
|
|
|
+ .set(JdOrderDetails::getDeliverCenterId,jdOrderDetails.getDeliverCenterId())
|
|
|
+ .set(JdOrderDetails::getNonDeliveryReason,jdOrderDetails.getNonDeliveryReason())
|
|
|
+ .eq(JdOrderDetails::getId,jdOrderDetails.getId()).update();
|
|
|
+ }
|
|
|
+ }
|
|
|
}
|