订单详情增加门店电话

Reviewed-on: #10

src/main/java/com/sczx/order/convert/OrderConvert.java

@@ -74,6 +74,7 @@ public interface OrderConvert {
             @Mapping(source = "orderMainPO.damageAmount", target = "damageAmount"),
             @Mapping(source = "orderMainPO.damageDesc", target = "damageDesc"),
             @Mapping(source = "companyStoreDTO.name", target = "storeName"),
+            @Mapping(source = "companyStoreDTO.phone", target = "storePhone"),
             @Mapping(source = "companyStoreDTO.detailedAddress", target = "detailedAddress"),
             @Mapping(source = "companyStoreDTO.latitude", target = "latitude"),
             @Mapping(source = "companyStoreDTO.longitude", target = "longitude"),

src/main/java/com/sczx/order/dto/OrderDetailDTO.java

@@ -25,6 +25,9 @@ public class OrderDetailDTO {
     @ApiModelProperty("门店名称")
     private String storeName;
 
+    @ApiModelProperty("门店电话")
+    private String storePhone;
+
     @ApiModelProperty("详细地址")
     private String detailedAddress;
 

src/main/java/com/sczx/order/service/impl/OrderServiceImpl.java

@@ -584,7 +584,7 @@ public class OrderServiceImpl implements OrderService {
         }
         LambdaQueryWrapper<OrderSubPO> querySubWrapper2 = new LambdaQueryWrapper<>();
         querySubWrapper2.eq(OrderSubPO::getOrderId, orderMainPO.getOrderId())
-                .in(OrderSubPO::getPayStatus, Arrays.asList(PayStatusEnum.SUCCESS.getCode(), PayStatusEnum.REFUNDING.getCode(), PayStatusEnum.REFUND_SUCCESS.getCode())).orderByDesc(OrderSubPO::getUpdateTime);
+                .in(OrderSubPO::getPayStatus, Arrays.asList(PayStatusEnum.USERPAYING.getCode(),PayStatusEnum.SUCCESS.getCode(), PayStatusEnum.REFUNDING.getCode(), PayStatusEnum.REFUND_SUCCESS.getCode())).orderByDesc(OrderSubPO::getUpdateTime);
         List<OrderSubPO> orderSubPOList2 = orderSubRepo.list(querySubWrapper2);
         if(!CollectionUtils.isEmpty(orderSubPOList2)){
             orderDetailDTO.setLastPayOrderNo(orderSubPOList2.get(0).getPaymentId());
@@ -691,7 +691,7 @@ public class OrderServiceImpl implements OrderService {
     @Override
     public void rejectRentOrder(RejectOrderReq rejectOrderReq) {
         OrderMainPO orderMainPO = queryOrderMainPoByOrderNo(rejectOrderReq.getOrderNo(), "0");
-        if(!orderMainPO.getOrderStatus().equals(OrderStatusEnum.WAIT_PICK.getCode())||!orderMainPO.getOrderStatus().equals(OrderStatusEnum.WAIT_RETURN.getCode())){
+        if(!orderMainPO.getOrderStatus().equals(OrderStatusEnum.WAIT_PICK.getCode()) && !orderMainPO.getOrderStatus().equals(OrderStatusEnum.WAIT_RETURN.getCode())){
             throw new BizException("订单状态异常,非待取车或待还车状态,无法驳回");
         }
         SimpleUserInfoDTO userInfoDTO = jwtUtil.getUserInfoFromToken();
@@ -726,11 +726,12 @@ public class OrderServiceImpl implements OrderService {
                         fdSubOrder.setPaymentId(orderSubPO.getPaymentId());
                         fdSubOrder.setRefundId(outRefundNo);
                         fdSubOrder.setRemark(rejectOrderReq.getRejectReason());
+                        fdSubOrder.setCreatedAt(LocalDateTime.now());
                         orderSubRepo.save(fdSubOrder);
                     }
                 }
             });
-        } else if(orderMainPO.getOrderStatus().equals(OrderStatusEnum.WAIT_RETURN.getCode())){
+        } else {
             LambdaUpdateWrapper<OrderMainPO> updateWrapper = new LambdaUpdateWrapper<>();
             updateWrapper.set(OrderMainPO::getOrderStatus, OrderStatusEnum.RENT_ING.getCode());
             updateWrapper.set(OrderMainPO::getActEndRentTime, LocalDateTime.now());

src/main/java/com/sczx/order/task/NoPickCarProcessTask.java

@@ -81,7 +81,7 @@ public class NoPickCarProcessTask {
 
             log.info("当天未提车或未还车订单处理完成，成功处理{}个订单", successCount);
         } catch (Exception e) {
-            log.error("处理当天未提车或未还车订单失败", e);
+            log.error("处理当天未提车或未还车订单失败", e);  
             throw e;
         }
     }

src/main/resources/mapper/OrderMainMapper.xml

@@ -52,7 +52,7 @@
                 </foreach>
             </if>
             <if test="queryBrandName != null and queryBrandName != ''">
-                and m.brand_name like concat('%', #{queryBrandName}, '%')
+                and (m.brand_name like concat('%', #{queryBrandName}, '%') or m.model_name like concat('%', #{queryBrandName}, '%'))
             </if>
         </where>
         order by o.update_time desc