fix support

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

@@ -4,7 +4,7 @@ import cn.rankin.cmsweb.service.trade.order.OrderService;
 import cn.rankin.common.utils.api.model.APIResult;
 import cn.rankin.common.utils.api.page.Page;
 import cn.rankin.data.api.cms.OrderSearchWebDTO;
-import cn.rankin.data.api.trade.dto.UserOrderDTO;
+import cn.rankin.data.api.trade.dto.OrderDTO;
 import cn.rankin.data.api.trade.vo.UserOrderVo;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
@@ -17,8 +17,8 @@ public class OrderController {
     private OrderService orderService;
 
     @RequestMapping(method = RequestMethod.POST)
-    public APIResult<UserOrderVo> create(@RequestBody UserOrderDTO userOrderDTO) {
-        return orderService.create(userOrderDTO);
+    public APIResult<UserOrderVo> create(@RequestBody OrderDTO orderDTO) {
+        return orderService.create(orderDTO);
     }
 
     @RequestMapping(value = "/{orderId}", method = RequestMethod.GET)

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

@@ -13,7 +13,7 @@ import cn.rankin.common.utils.enums.ProductTypeEnum;
 import cn.rankin.common.utils.util.BeanUtil;
 import cn.rankin.data.api.cms.OrderSearchWebDTO;
 import cn.rankin.data.api.product.vo.GoodsVo;
-import cn.rankin.data.api.trade.dto.UserOrderDTO;
+import cn.rankin.data.api.trade.dto.OrderDTO;
 import cn.rankin.data.api.trade.dto.OrderGoodsDTO;
 import cn.rankin.data.api.trade.entity.OrderGoods;
 import cn.rankin.data.api.trade.entity.Order;
@@ -99,8 +99,8 @@ public class OrderService {
         return orderServiceFeign.cancel(orderId);
     }
 
-    public APIResult<UserOrderVo> create(UserOrderDTO userOrderDTO) {
-        String uid = userOrderDTO.getUid();
+    public APIResult<UserOrderVo> create(OrderDTO orderDTO) {
+        String uid = orderDTO.getUid();
         APIResult<TerminalUserVo> userVoAPIResult = terminalUserService.getUser(uid);
         if (!userVoAPIResult.getSuccess()) {
             return APIResult.error(CmsWebAPICode.error("用户不存在"));
@@ -108,7 +108,7 @@ public class OrderService {
 
         TerminalUserVo terminalUserVo = userVoAPIResult.getData();
 
-        List<OrderGoodsDTO> orderGoodsDTOList = userOrderDTO.getGoods();
+        List<OrderGoodsDTO> orderGoodsDTOList = orderDTO.getGoods();
         if (CollectionUtils.isEmpty(orderGoodsDTOList)) {
             return APIResult.error(CmsWebAPICode.error("商品为空"));
         }
@@ -151,11 +151,11 @@ public class OrderService {
             finalGoodsList.add(orderGoodsDTO);
             totalPrice = totalPrice.add(goodsVo.getMerchantPrice().multiply(new BigDecimal(count)));
         }
-        userOrderDTO.setFinalPrice(totalPrice.subtract(userOrderDTO.getAdjustPrice()));
-        userOrderDTO.setOriginPrice(totalPrice);
-        userOrderDTO.setGoods(finalGoodsList);
+        orderDTO.setFinalPrice(totalPrice.subtract(orderDTO.getAdjustPrice()));
+        orderDTO.setOriginPrice(totalPrice);
+        orderDTO.setGoods(finalGoodsList);
 
-        APIResult userOrderAPIResult = orderServiceFeign.create(userOrderDTO);
+        APIResult userOrderAPIResult = orderServiceFeign.create(orderDTO);
         return userOrderAPIResult;
     }
 

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

@@ -2,7 +2,7 @@ package cn.rankin.cmsweb.service.trade.order;
 
 import cn.rankin.common.utils.api.model.APIResult;
 import cn.rankin.common.utils.api.page.Page;
-import cn.rankin.data.api.trade.dto.UserOrderDTO;
+import cn.rankin.data.api.trade.dto.OrderDTO;
 import cn.rankin.data.api.trade.entity.Order;
 import org.springframework.cloud.netflix.feign.FeignClient;
 import org.springframework.web.bind.annotation.*;
@@ -17,7 +17,7 @@ public interface OrderServiceFeign {
     APIResult<Page<Order>> search(@RequestParam Map<String, Object> searchDTO);
 
     @RequestMapping(value = "/order", method = RequestMethod.POST)
-    APIResult<Order> create(@RequestBody UserOrderDTO userOrderDTO);
+    APIResult<Order> create(@RequestBody OrderDTO orderDTO);
 
     @RequestMapping(value = "/order/{orderId}", method = RequestMethod.GET)
     APIResult<Order> getOrder(@PathVariable("orderId") String orderId);

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

@@ -27,6 +27,8 @@ public class CourseDTO implements Serializable {
 
     private String bgUrl;
 
+    private String cpId;
+
     private BaseStatusEnum status;
 
     // 有序

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

@@ -21,6 +21,8 @@ public class SupportDTO implements Serializable {
 
     private String detail;
 
+    private String cpId;
+
     private List<String> imgList;
 
     private BaseStatusEnum status;

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

@@ -1,11 +1,11 @@
 package cn.rankin.data.api.product.vo;
 
 import cn.rankin.common.utils.enums.BaseStatusEnum;
+import cn.rankin.common.utils.enums.ProductTypeEnum;
 import lombok.Data;
 
 import java.io.Serializable;
 import java.util.List;
-import java.util.Set;
 
 @Data
 public class SupportVo implements Serializable {
@@ -26,10 +26,12 @@ public class SupportVo implements Serializable {
 
     private String cpId;
 
+    private ProductTypeEnum type;
+
     private List<String> imgList;
 
     private BaseStatusEnum status;
 
-    private Set<String> supportList;
+    private List<SupportVo> supportList;
 
 }

rankin-data-api/src/main/java/cn/rankin/data/api/trade/dto/UserOrderDTO.java

@@ -10,7 +10,7 @@ import java.util.List;
 
 @Data
 @ToString
-public class UserOrderDTO implements Serializable {
+public class OrderDTO implements Serializable {
 
     private String id;
 
@@ -24,6 +24,12 @@ public class UserOrderDTO implements Serializable {
 
     private OrderStatusEnum status;
 
+    private String name;
+
+    private String mobile;
+
+    private String address;
+
     private String note;
 
     private List<OrderGoodsDTO> goods;

rankin-task/src/main/java/cn/rankin/task/service/ProductService.java

@@ -14,7 +14,7 @@ import org.springframework.web.bind.annotation.RequestParam;
 
 import java.util.List;
 
-@FeignClient(name = "service.name.product", fallback = ProductService.ProductServiceHystrix.class)
+@FeignClient(name = "${service.product.name}", fallback = ProductService.ProductServiceHystrix.class)
 public interface ProductService {
 
     @RequestMapping(value = "/product/package/{pkgId}", method = RequestMethod.GET)

rankin-trade-service/src/main/java/cn/rankin/tradeservice/controller/OrderController.java

@@ -3,7 +3,7 @@ package cn.rankin.tradeservice.controller;
 import cn.rankin.common.utils.api.model.APIResult;
 import cn.rankin.common.utils.api.page.Page;
 import cn.rankin.data.api.trade.dto.OrderSearchDTO;
-import cn.rankin.data.api.trade.dto.UserOrderDTO;
+import cn.rankin.data.api.trade.dto.OrderDTO;
 import cn.rankin.data.api.trade.entity.Order;
 import cn.rankin.tradeservice.service.OrderService;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -18,8 +18,8 @@ public class OrderController {
 
     // cms web需要做前置校验
     @RequestMapping(method = RequestMethod.POST)
-    public APIResult<Order> create(@RequestBody UserOrderDTO userOrderDTO) {
-        return orderService.create(userOrderDTO);
+    public APIResult<Order> create(@RequestBody OrderDTO orderDTO) {
+        return orderService.create(orderDTO);
     }
 
     @RequestMapping(value = "/{orderId}", method = RequestMethod.GET)

rankin-trade-service/src/main/java/cn/rankin/tradeservice/service/OrderService.java

@@ -8,7 +8,7 @@ import cn.rankin.common.utils.enums.OrderSplitStatusEnum;
 import cn.rankin.common.utils.enums.OrderStatusEnum;
 import cn.rankin.common.utils.util.JpaSortUtil;
 import cn.rankin.data.api.trade.dto.OrderSearchDTO;
-import cn.rankin.data.api.trade.dto.UserOrderDTO;
+import cn.rankin.data.api.trade.dto.OrderDTO;
 import cn.rankin.data.api.trade.dto.OrderGoodsDTO;
 import cn.rankin.data.api.trade.entity.OrderGoods;
 import cn.rankin.data.api.trade.entity.Order;
@@ -56,14 +56,14 @@ public class OrderService {
     }
 
     @Transactional
-    public APIResult<Order> create(UserOrderDTO userOrderDTO) {
-        Order order = convert(userOrderDTO);
+    public APIResult<Order> create(OrderDTO orderDTO) {
+        Order order = convert(orderDTO);
         order.setOrderStatus(OrderStatusEnum.UNPAID);
         order.setStatus(BaseStatusEnum.NORMAL);
         order.setSplitStatus(OrderSplitStatusEnum.NO);
         order = orderRepository.save(order);
         String orderId = order.getId();
-        List<OrderGoodsDTO> orderGoodsDTOList = userOrderDTO.getGoods();
+        List<OrderGoodsDTO> orderGoodsDTOList = orderDTO.getGoods();
         orderGoodsService.createRelation(orderId, orderGoodsDTOList);
         List<OrderGoods> orderGoodsList = orderGoodsService.findByOrderId(orderId);
         order.setGoods(orderGoodsList);

rankin-trade-service/src/main/java/cn/rankin/tradeservice/utils/DTOConverter.java

@@ -1,6 +1,6 @@
 package cn.rankin.tradeservice.utils;
 
-import cn.rankin.data.api.trade.dto.UserOrderDTO;
+import cn.rankin.data.api.trade.dto.OrderDTO;
 import cn.rankin.data.api.trade.dto.OrderGoodsDTO;
 import cn.rankin.data.api.trade.entity.Order;
 import cn.rankin.data.api.trade.entity.OrderGoods;
@@ -8,9 +8,9 @@ import org.springframework.beans.BeanUtils;
 
 public class DTOConverter {
 
-    public static Order convert(UserOrderDTO userOrderDTO) {
+    public static Order convert(OrderDTO orderDTO) {
         Order order = new Order();
-        BeanUtils.copyProperties(userOrderDTO, order);
+        BeanUtils.copyProperties(orderDTO, order);
         return order;
     }