add category of courseware

rankin-cms-web/src/main/java/cn/rankin/cmsweb/controller/trade/OrderController.java

@@ -1,6 +1,7 @@
 package cn.rankin.cmsweb.controller.trade;
 
 import cn.rankin.cmsweb.assist.resolver.NeedUser;
+import cn.rankin.cmsweb.code.CmsWebAPICode;
 import cn.rankin.cmsweb.entity.UserDetails;
 import cn.rankin.cmsweb.service.trade.order.OrderService;
 import cn.rankin.common.utils.api.model.APIResult;
@@ -79,4 +80,21 @@ public class OrderController {
         }
         return orderService.search(searchDTO);
     }
+
+    @RequestMapping(value = "/send/{detailId}", method = RequestMethod.POST)
+    public APIResult<Boolean> send(@NeedUser UserDetails user, @PathVariable("detailId") String detailId) {
+        if (user.isCp() || user.isPlatForm()) {
+            return orderService.send(detailId);
+        }
+        return APIResult.error(CmsWebAPICode.ACCESS_DENIED);
+    }
+
+
+    @RequestMapping(value = "/receive/{detailId}", method = RequestMethod.POST)
+    public APIResult<Boolean> receive(@NeedUser UserDetails user, @PathVariable("detailId") String detailId) {
+        if (user.isMerchant() || user.isPlatForm()) {
+            return orderService.receive(detailId);
+        }
+        return APIResult.error(CmsWebAPICode.ACCESS_DENIED);
+    }
 }

rankin-cms-web/src/main/java/cn/rankin/cmsweb/service/trade/order/OrderClient.java

@@ -38,4 +38,10 @@ public interface OrderClient {
 
     @RequestMapping(value = "/order/detail", method = RequestMethod.POST)
     APIResult<Page<OrderDetail>> searchDetail(@RequestBody OrderDetailSearchDTO searchDTO);
+
+    @RequestMapping(value = "/order/send/{detailId}", method = RequestMethod.POST)
+    APIResult<Boolean> send(@PathVariable("detailId") String detailId);
+
+    @RequestMapping(value = "/receive/{detailId}", method = RequestMethod.POST)
+    APIResult<Boolean> receive(@PathVariable("detailId") String detailId);
 }

rankin-cms-web/src/main/java/cn/rankin/cmsweb/service/trade/order/OrderService.java

@@ -3,7 +3,6 @@ package cn.rankin.cmsweb.service.trade.order;
 import cn.rankin.cmsweb.code.CmsWebAPICode;
 import cn.rankin.cmsweb.service.product.GoodsService;
 import cn.rankin.cmsweb.service.user.CampusService;
-import cn.rankin.cmsweb.service.user.MerchantService;
 import cn.rankin.cmsweb.service.user.TerminalUserService;
 import cn.rankin.common.utils.api.model.APIResult;
 import cn.rankin.common.utils.api.model.BaseCode;
@@ -62,6 +61,7 @@ public class OrderService {
     @Autowired
     private PayingService payingService;
 
+    // 支付
     public APIResult<Boolean> pay(String orderId) {
         APIResult<Order> userOrderAPIResult = orderClient.getOrder(orderId);
         Order order = userOrderAPIResult.getData();
@@ -103,10 +103,22 @@ public class OrderService {
         return APIResult.ok();
     }
 
+    // 取消
     public APIResult<Boolean> cancel(String orderId) {
         return orderClient.cancel(orderId);
     }
 
+    // 发货
+    public APIResult<Boolean> send(String detailId) {
+        return orderClient.send(detailId);
+    }
+
+    // 收货
+    public APIResult<Boolean> receive(String detailId) {
+        return orderClient.receive(detailId);
+    }
+
+    // 创建订单
     public APIResult<OrderVo> create(OrderDTO orderDTO) {
         String uid = orderDTO.getUid();
         APIResult<TerminalUserVo> userVoAPIResult = terminalUserService.getUser(uid);

rankin-data-api/src/main/java/cn/rankin/data/api/product/dto/WareDTO.java

@@ -17,6 +17,8 @@ public class WareDTO implements Serializable {
 
     private String name;
 
+    private String category;
+
     private String digest;
 
     private List<String> resourceList;

rankin-data-api/src/main/java/cn/rankin/data/api/product/entity/CourseWare.java

@@ -29,6 +29,8 @@ public class CourseWare implements Serializable{
     @Column
     private String name;
 
+    private String category;
+
     @Column
     private String digest;
 

rankin-data-api/src/main/java/cn/rankin/data/api/product/vo/CourseWareVo.java

@@ -18,6 +18,8 @@ public class CourseWareVo implements Serializable {
 
     private String name;
 
+    private String category;
+
     private String digest;
 
 //    private List<String> resourceList;