Merge branch 'master' of http://gogs.chelvc.com/wuyongqiang/maintain

src/main/java/com/chelvc/cloud/maintain/controller/HelpCategoryController.java

@@ -11,8 +11,11 @@ import lombok.RequiredArgsConstructor;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RestController;
 
+import javax.validation.Valid;
+
 /**
  * 客服中心接口
  *
@@ -33,7 +36,7 @@ public class HelpCategoryController {
      * @param
      */
     @PostMapping("/problem/list")
-    public List<HelpCategoryDTO> selectHelpCategoryList(HelpCategoryModifyParam helpCategory) {
+    public List<HelpCategoryDTO> selectHelpCategoryList(@RequestBody @Valid  HelpCategoryModifyParam helpCategory) {
         return this.helpCategoryClient.selectHelpCategoryList(helpCategory);
     }
 

src/main/java/com/chelvc/cloud/maintain/controller/OmsOrderController.java

@@ -23,6 +23,7 @@ import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
 
 /**
@@ -173,4 +174,14 @@ public class OmsOrderController {
     public OmsOrderDetailDTO getOrderDetail(@PathVariable("id") @Min(value = 1, message = "主键不能小于1") Long id) {
         return this.omsOrderClient.detail(id);
     }
+
+
+    /**
+     * 根据订单核销码获取订单详情
+     */
+    @GetMapping("/omsOrder/{orderSn}/{merchantId}")
+    public OmsOrderDetailDTO getOrderDetailBySn(@PathVariable("orderSn") @Min(value = 1, message = "核销码不能小于1") Long orderSn,
+                                            @PathVariable("merchantId") @Min(value = 1, message = "商家ID不能小于1") Long merchantId) {
+        return this.omsOrderClient.getOrderDetail(orderSn,merchantId);
+    }
 }

src/main/java/com/chelvc/cloud/maintain/controller/ReservationController.java

@@ -12,6 +12,7 @@ import com.chelvc.cloud.maintain.vo.ReservationVO;
 import com.chelvc.cloud.vehicle.client.ReservationClient;
 import com.chelvc.cloud.vehicle.client.dto.MerchantReservationDTO;
 import com.chelvc.cloud.vehicle.client.dto.ReservationDTO;
+import com.chelvc.cloud.vehicle.client.dto.UserReservationDTO;
 import com.chelvc.cloud.vehicle.client.param.ReservationModifyParam;
 import com.chelvc.cloud.vehicle.client.param.ReservationPagingParam;
 import com.chelvc.cloud.vehicle.client.param.ReservationQueryParam;
@@ -121,4 +122,16 @@ public class ReservationController {
     public Pagination<MerchantReservationDTO> getMerchantReservationPaging(@Valid ReservationPagingParam param) {
         return this.reservationClient.getMerchantReservationPaging(param);
     }
+
+
+    /**
+     * 用户端分页查询预约
+     *
+     * @param param 查询参数
+     * @return 预约分页信息
+     */
+    @GetMapping("/reservation/getUserReservation")
+    public Pagination<UserReservationDTO> getUserReservationPaging(@Valid ReservationPagingParam param) {
+        return this.reservationClient.getUserReservationPaging(param);
+    }
 }

src/main/java/com/chelvc/cloud/maintain/vo/SimpleMerchantVO.java

@@ -67,4 +67,9 @@ public class SimpleMerchantVO implements Serializable {
      */
     private String mainBusinessName;
 
+    /**
+     * 营业时间
+     */
+    private String opening;
+
 }