返回数据

src/main/java/com/mmc/oms/dao/lease/LeaseOrderDao.java

@@ -46,4 +46,6 @@ public interface LeaseOrderDao {
     List<LeaseOrderExpressDO> listLeaseOrderExpress(List<Integer> expressIds);
 
     void updateLeaseOrderProportion(Integer id, int proportion);
+
+    LeaseRefundOrderDO selectGiveBackByOrderId(Integer id);
 }

src/main/java/com/mmc/oms/model/dto/lease/LeaseOrderDTO.java

@@ -91,6 +91,10 @@ public class LeaseOrderDTO implements Serializable {
     private UavOrderExpressDTO uavOrderExpressDTO;
     @ApiModelProperty("快递信息")
     private KdnExpDTO kdnExpDTO;
+    @ApiModelProperty("归还快递信息")
+    private KdnExpDTO returnKdnExpDTO;
+    @ApiModelProperty("归还上传的信息")
+    private LeaseRefundOrderDTO leaseRefundOrderDTO;
     @ApiModelProperty("购买数量")
     private Integer wareNum;
     @ApiModelProperty(value = "单价", hidden = true)

src/main/java/com/mmc/oms/service/lease/impl/LeaseOrderServiceImpl.java

@@ -329,6 +329,15 @@ public class LeaseOrderServiceImpl implements LeaseOrderService {
             // 快递信息
             KdnExpDTO kdnExpDTO = this.getOrderExpInfo(leaseOrderExpressDO);
             leaseOrderDTO.setKdnExpDTO(kdnExpDTO);
+            // 判断订单状态是否是已归还状态
+            if (leaseOrderDO.getStatusCode().compareTo(LeaseOrderStatus.WAITING_MERCHANT_CONFIRM.getCode()) > 0) {
+                // 快递信息
+                KdnExpDTO returnKdnExpDTO = this.getReturnOrderExpInfo(leaseOrderExpressDO);
+                leaseOrderDTO.setReturnKdnExpDTO(returnKdnExpDTO);
+                // 根据订单id查询归还信息
+                LeaseRefundOrderDO leaseRefundOrderDO = leaseOrderDao.selectGiveBackByOrderId(id);
+                leaseOrderDTO.setLeaseRefundOrderDTO(leaseRefundOrderDO == null ? null : leaseRefundOrderDO.buildLeaseRefundOrderDTO());
+            }
         }
         // 设置个人信息
         UserAccountSimpleDTO userAccountSimpleDTO = userAppApi.feignGetUserSimpleInfo(leaseOrderDO.getUserAccountId(), currentAccount.getToken());
@@ -357,6 +366,23 @@ public class LeaseOrderServiceImpl implements LeaseOrderService {
         return kdn;
     }
 
+    private KdnExpDTO getReturnOrderExpInfo(LeaseOrderExpressDO exp) throws Exception {
+        String json = "";
+        if ("SF".equals(exp.getReturnExpCode())) {
+            json = KdnExpressUtil.SF("", exp.getReturnExpNo());
+        } else if ("JD".equals(exp.getReturnExpCode())) {
+            json = KdnExpressUtil.JD("", exp.getReturnExpNo());
+        } else {
+            json = KdnExpressUtil.others(exp.getReturnExpCode(), exp.getReturnExpNo());
+        }
+        KdnExpDTO kdn = JsonUtil.parseJsonToObj(json, KdnExpDTO.class);
+        kdn.setLogisticCode(exp.getReturnExpCode());
+        if (!org.springframework.util.CollectionUtils.isEmpty(kdn.getTraces())) {
+            Collections.sort(kdn.getTraces(), Comparator.comparing(ExpStationsDTO::getAcceptTime).reversed());// 升序
+        }
+        return kdn;
+    }
+
     @Override
     @Transactional
     public ResultBody close(LeaseOrderRefundVO leaseOrderRefundVO, String token) {
@@ -600,6 +626,7 @@ public class LeaseOrderServiceImpl implements LeaseOrderService {
     }
 
     @Override
+    @Transactional
     public ResultBody giveBack(LeaseOrderRefundVO leaseOrderRefundVO, BaseAccountDTO currentAccount) {
         LeaseOrderDO leaseOrderDO = leaseOrderDao.detail(leaseOrderRefundVO.getOrderId());
         log.info("leaseOrderDO:{}", JSONObject.toJSONString(leaseOrderDO));
@@ -608,6 +635,10 @@ public class LeaseOrderServiceImpl implements LeaseOrderService {
         }
         LeaseOrderExpressDO leaseOrderExpressDO = new LeaseOrderExpressDO(leaseOrderRefundVO);
         leaseOrderDao.updateLeaseOrderExpress(leaseOrderExpressDO);
+        // 插入归还信息
+        LeaseRefundOrderDO leaseRefundOrderDO = new LeaseRefundOrderDO(leaseOrderRefundVO);
+        leaseRefundOrderDO.setType(OrderType.RETURN.getCode());
+        leaseOrderDao.addLeaseRefundOrder(leaseRefundOrderDO);
         this.updateLeaseOrderStatus(leaseOrderRefundVO.getOrderId(), LeaseOrderStatus.WAITING_MERCHANT_CONFIRM);
         return ResultBody.success();
     }

src/main/resources/mapper/lease/LeaseOrderDao.xml

@@ -231,4 +231,10 @@ share_cash_pledge,salary_cash_pledge
             </foreach>
         </where>
     </select>
+    <select id="selectGiveBackByOrderId" resultType="com.mmc.oms.entity.lease.LeaseRefundOrderDO">
+        select
+        <include refid="lease_refund_order_column"/>
+        from lease_refund_order
+        where lease_order_id = #{leaseOrderId}
+    </select>
 </mapper>
\ No newline at end of file