后端代码逻辑优化

vehicle-client/src/main/java/com/chelvc/cloud/vehicle/client/HelpCategoryClient.java

@@ -38,7 +38,7 @@ public interface HelpCategoryClient {
      * @param helpCategory 帮助分类
      * @return 帮助分类集合
      */
-    @GetMapping("/helpCategory/selectHelpCategoryList")
+    @PostMapping("/helpCategory/selectHelpCategoryList")
     List<HelpCategoryDTO> selectHelpCategoryList(@SpringQueryMap HelpCategoryModifyParam helpCategory);
 
     /**

vehicle-client/src/main/java/com/chelvc/cloud/vehicle/client/param/OrderReturnApplyPagingParam.java

@@ -35,4 +35,8 @@ public class OrderReturnApplyPagingParam implements Serializable
 
     /** 商户id */
     private Long merchantId;
+    /**
+     * 订单ID
+     */
+    private Long orderId;
 }

vehicle-server/src/main/java/com/chelvc/cloud/vehicle/server/controller/HelpCategoryController.java

@@ -45,7 +45,7 @@ public class HelpCategoryController {
      * @param helpCategory 帮助分类
      * @return 帮助分类集合
      */
-    @GetMapping("/helpCategory/selectHelpCategoryList")
+    @PostMapping("/helpCategory/selectHelpCategoryList")
     public List<HelpCategoryDTO> selectHelpCategoryList(HelpCategoryModifyParam helpCategory) {
         return helpCategoryService.selectHelpCategoryList(helpCategory);
     }

vehicle-server/src/main/java/com/chelvc/cloud/vehicle/server/service/impl/HelpCategoryServiceImpl.java

@@ -63,7 +63,7 @@ public class HelpCategoryServiceImpl extends ServiceImpl<HelpCategoryMapper,Help
                 .like(StringUtils.notEmpty(param.getName()),HelpCategory::getName,param.getName())
                 .eq(StringUtils.notEmpty(param.getShowStatus()),HelpCategory::getShowStatus,param.getShowStatus())
                 .eq(StringUtils.notEmpty(param.getCategoryId()),HelpCategory::getId,param.getCategoryId())
-                .eq(HelpCategory::getType,param.getType())
+                .eq(StringUtils.notEmpty(param.getType()),HelpCategory::getType,param.getType())
                 .orderByDesc(HelpCategory::getSort)
                 .list();
         List<HelpCategoryDTO> helpCategoryList = HelpCategoryCopier.INSTANCE.copying(helpCategories);

vehicle-server/src/main/java/com/chelvc/cloud/vehicle/server/service/impl/OderHandleServiceImpl.java

@@ -69,7 +69,7 @@ public class OderHandleServiceImpl implements OrderHandleService {
 
     @Override
     public void handleOrder(OmsOrder omsOrder) {
-        omsOrder.setStatus(4);
+        omsOrder.setStatus(3);
         omsOrder.setConfirmStatus(1);
         omsOrder.setReceiveTime(new Date());
         omsOrder.setUpdateTime(new Date());

vehicle-server/src/main/java/com/chelvc/cloud/vehicle/server/service/impl/OmsOrderReturnApplyServiceImpl.java

@@ -150,6 +150,7 @@ public class OmsOrderReturnApplyServiceImpl extends ServiceImpl<OmsOrderReturnAp
         }
         Page<OmsOrderReturnApply> page = this.lambdaQuery()
                 .eq(StringUtils.notEmpty(param.getMerchantId()),OmsOrderReturnApply::getMerchantId,param.getMerchantId())
+                .eq(StringUtils.notEmpty(param.getOrderId()),OmsOrderReturnApply::getOrderId,param.getOrderId())
                 .orderByDesc(OmsOrderReturnApply::getCreateTime)
                 .orderByDesc(OmsOrderReturnApply::getReceiveTime)
                 .page(DatabaseContextHolder.page(param.getPaging()));

vehicle-server/src/main/java/com/chelvc/cloud/vehicle/server/service/impl/OmsOrderServiceImpl.java

@@ -66,6 +66,8 @@ public class OmsOrderServiceImpl extends ServiceImpl<OmsOrderMapper, OmsOrder> i
 
     private final UserClient userService;
 
+    private final UserReceiveAddressService userReceiveAddressService;
+
     @Override
     public ConfirmOrderResultDTO generateConfirmOrder(OmsOrderModifyParam orderParam) {
         ConfirmOrderResultDTO result = new ConfirmOrderResultDTO();
@@ -222,14 +224,14 @@ public class OmsOrderServiceImpl extends ServiceImpl<OmsOrderMapper, OmsOrder> i
         //订单类型：0->正常订单；1->秒杀订单
         order.setOrderType(0);
         //收货人信息：姓名、电话、邮编、地址
-//        UmsMemberReceiveAddress address = memberReceiveAddressService.getItem(orderParam.getMemberReceiveAddressId());
-//        order.setReceiverName(address.getName());
-//        order.setReceiverPhone(address.getPhoneNumber());
-//        order.setReceiverPostCode(address.getPostCode());
-//        order.setReceiverProvince(address.getProvince());
-//        order.setReceiverCity(address.getCity());
-//        order.setReceiverRegion(address.getRegion());
-//        order.setReceiverDetailAddress(address.getDetailAddress());
+        UserReceiveAddressDTO address = this.userReceiveAddressService.queryById(orderParam.getUserReceiveAddressId());
+        order.setReceiverName(address.getReceiveName());
+        order.setReceiverPhone(address.getPhone());
+        order.setReceiverPostCode(address.getPostCode());
+        order.setReceiverProvince(address.getProvince());
+        order.setReceiverCity(address.getCity());
+        order.setReceiverRegion(address.getRegion());
+        order.setReceiverDetailAddress(address.getDetailAddress());
         //0->未确认；1->已确认
         order.setConfirmStatus(0);
         order.setDeleteStatus(0);
@@ -922,6 +924,7 @@ public class OmsOrderServiceImpl extends ServiceImpl<OmsOrderMapper, OmsOrder> i
         OmsOrder omsOrder = this.lambdaQuery()
                 .eq(OmsOrder::getOrderSn,orderSn)
                 .eq(OmsOrder::getMerchantId,merchantId)
+                .eq(OmsOrder::getStatus,1)
                 .one();
         if (null == omsOrder){
             return null;

vehicle-server/src/main/resources/mapper/ReservationMapper.xml

@@ -113,9 +113,8 @@
         re.create_time,
         re.appoint_time,
         od.pay_amount,
-        re.user_id,
         re.status,
-        m.id merchantId
+        m.id as merchantId,
         m.name ,
         m.logo
         FROM
@@ -142,8 +141,7 @@
         <result column="create_time" property="createTime" jdbcType="TIMESTAMP"/>
         <result property="payAmount"    column="pay_amount"    />
         <result column="order_id" property="orderId" jdbcType="BIGINT"/>
-        <result column="user_id" property="userId" jdbcType="BIGINT"/>
-        <result column="merchantId" property="merchantId" jdbcType="BIGINT"/>
+        <result column="merchantId" property="mertchantId" jdbcType="BIGINT"/>
         <result column="name" property="merchantName" jdbcType="VARCHAR"/>
         <result column="logo" property="logo" jdbcType="VARCHAR"/>
         <association property="goodItem" javaType="com.chelvc.cloud.vehicle.client.dto.OrderItemDTO">