move api

mall-service/src/main/java/com/txz/mall/controller/OrderController.java

@@ -9,8 +9,6 @@ import com.txz.mall.core.ResultCode;
 import com.txz.mall.enums.PinkOrderStatusEnum;
 import com.txz.mall.model.StoreOrder;
 import com.txz.mall.service.StoreOrderService;
-import com.txz.mall.service.StorePinkService;
-import com.txz.mall.web.vo.ProductCarouselVO;
 import dto.CreateOrderRequest;
 import dto.StoreOrderDTO;
 import dto.StoreOrderDeliveryDTO;
@@ -45,8 +43,6 @@ public class OrderController {
     @Resource
     private OrderServiceBusiness orderServiceBusiness;
     
-    @Resource
-    private StorePinkService storePinkService;
     
     @PostMapping("/add")
     @ApiOperation(value = "创建订单")
@@ -236,12 +232,4 @@ public class OrderController {
         return Result.success();
     }
     
-    /**
-     * 商品轮播
-     */
-    @GetMapping("carousel/{productId:^\\d+$}")
-    public Result<List<ProductCarouselVO>> carousel(@PathVariable("productId") Long productId) {
-        return Result.success(storePinkService.carousel(productId));
-    }
-    
 }

mall-service/src/main/java/com/txz/mall/controller/appcontroller/AppOrderController.java

@@ -1,6 +1,5 @@
 package com.txz.mall.controller.appcontroller;
 
-import com.alibaba.fastjson.annotation.JSONField;
 import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
 import com.txz.mall.business.OrderServiceBusiness;
@@ -9,8 +8,10 @@ import com.txz.mall.core.Result;
 import com.txz.mall.core.ResultCode;
 import com.txz.mall.model.StoreOrder;
 import com.txz.mall.service.StoreOrderService;
+import com.txz.mall.service.StorePinkService;
 import com.txz.mall.util.EasyToUseUtil;
 import com.txz.mall.web.param.updateparam.StoreOrderUpdateParam;
+import com.txz.mall.web.vo.ProductCarouselVO;
 import dto.*;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
@@ -18,13 +19,11 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
-import org.springframework.web.multipart.MultipartFile;
 import vo.MyRecord;
 import vo.StoreOrderCountItemVO;
 import vo.StoreOrderVO;
 
 import javax.annotation.Resource;
-import javax.servlet.http.HttpServletResponse;
 import java.util.Date;
 import java.util.List;
 
@@ -35,19 +34,22 @@ import java.util.List;
 @RestController
 @RequestMapping("/app/order")
 public class AppOrderController {
-
+    
     private static Logger log = LoggerFactory.getLogger(AppOrderController.class);
-
+    
     @Resource
     private StoreOrderService storeOrderService;
     @Resource
     private OrderServiceBusiness orderServiceBusiness;
-
+    
+    @Resource
+    private StorePinkService storePinkService;
+    
     @PostMapping("/add")
     @ApiOperation(value = "创建订单")
     public Result add(@Validated @RequestBody CreateOrderRequest orderRequest) {
-
-
+        
+        
         if (orderRequest == null) {
             return Result.fail(ResultCode.OBJECT_IS_NULL);
         }
@@ -56,7 +58,7 @@ public class AppOrderController {
         MyRecord record = storeOrderService.createOrder(orderRequest);
         return Result.success(record);
     }
-
+    
     @DeleteMapping("/delete")
     @ApiOperation(value = "订单删除")
     public Result delete(@RequestParam Long id) {
@@ -74,7 +76,7 @@ public class AppOrderController {
         }
         return Result.success();
     }
-
+    
     @PutMapping("/update")
     @ApiOperation(value = "订单更新")
     public Result update(@RequestBody StoreOrder storeOrder) {
@@ -86,7 +88,7 @@ public class AppOrderController {
         }
         try {
             storeOrder.setUpdateTime(new Date());
-//    		storeOrder.setUpdateUserId(userId);
+            //    		storeOrder.setUpdateUserId(userId);
             storeOrderService.update(storeOrder);
         } catch (Exception e) {
             log.error("更新对象操作异常e:{}", e);
@@ -94,17 +96,17 @@ public class AppOrderController {
         }
         return Result.success();
     }
-
+    
     @PutMapping("/binding/address")
     @ApiOperation(value = "订单绑定地址")
     public Result update(@RequestBody StoreOrderUpdateParam storeOrderUpdateParam) {
-
+        
         try {
             StoreOrder storeOrder = new StoreOrder();
             storeOrder.setOrderId(storeOrderUpdateParam.getOrderId());
             storeOrder.setAddressId(storeOrderUpdateParam.getAddressId());
-            EasyToUseUtil.appUpdateAssignment(new Date(),storeOrder);
-
+            EasyToUseUtil.appUpdateAssignment(new Date(), storeOrder);
+            
             storeOrderService.bindingAddress(storeOrder);
         } catch (Exception e) {
             log.error("更新对象操作异常e:{}", e);
@@ -112,8 +114,8 @@ public class AppOrderController {
         }
         return Result.success();
     }
-
-
+    
+    
     @GetMapping("/detail")
     @ApiOperation(value = "订单获取详情")
     public Result<StoreOrderVO> detail(@RequestParam Long id) {
@@ -123,7 +125,7 @@ public class AppOrderController {
         StoreOrderVO vo = orderServiceBusiness.orderDetail(id);
         return Result.success(vo);
     }
-
+    
     @PostMapping("/list")
     @ApiOperation(value = "订单获取列表")
     public Result<List<StoreOrderVO>> list(@RequestBody StoreOrderDTO dto) {
@@ -134,11 +136,11 @@ public class AppOrderController {
             return Result.fail(ResultCode.INTERNAL_SERVER_ERROR);
         }
     }
-
+    
     @PostMapping("/app/list")
     @ApiOperation(value = "订单获取列表")
     public Result<List<StoreOrderVO>> appList(@RequestBody StoreOrderAppDTO dto) {
-
+        
         Long tokenUserId = AuthService.getTokenUserId(null);
         dto.setUserId(tokenUserId);
         PageHelper.startPage(dto.getPage(), dto.getSize());
@@ -152,101 +154,110 @@ public class AppOrderController {
         }
         return Result.success(pageInfo);
     }
-
+    
     @ApiOperation(value = "获取订单各状态数量")
     @GetMapping(value = "/status/num")
     public Result<StoreOrderCountItemVO> getOrderStatusNum() {
         return Result.success(storeOrderService.getOrderStatusNum());
     }
-
-//    @ApiOperation("导出订单")
-//    @PostMapping("/export")
-//    public Result exportFile(@RequestBody StoreOrderDTO dto, HttpServletResponse response) {
-//        storeOrderService.exportFile(dto, response);
-//        return Result.success();
-//    }
-//
-//    @ApiOperation("退款")
-//    @PostMapping("/refund")
-//    public Result refund(@RequestParam("id") Long id) {
-//        storeOrderService.refund(id);
-//        return Result.success();
-//    }
-
+    
+    //    @ApiOperation("导出订单")
+    //    @PostMapping("/export")
+    //    public Result exportFile(@RequestBody StoreOrderDTO dto, HttpServletResponse response) {
+    //        storeOrderService.exportFile(dto, response);
+    //        return Result.success();
+    //    }
+    //
+    //    @ApiOperation("退款")
+    //    @PostMapping("/refund")
+    //    public Result refund(@RequestParam("id") Long id) {
+    //        storeOrderService.refund(id);
+    //        return Result.success();
+    //    }
+    
     @ApiOperation("关闭订单")
     @PostMapping("/close")
     public Result close(@RequestParam("id") Long id) {
         storeOrderService.close(id);
         return Result.success();
     }
-
+    
     @ApiOperation("取消订单")
     @PostMapping("/cancel")
     public Result cancel(@RequestParam("id") Long id) {
         storeOrderService.cancel(id);
         return Result.success();
     }
-
+    
     @ApiOperation("联系用户")
     @PostMapping("/contactUser")
     public Result contactUser(@RequestParam("userId") Long userId) {
-//        storeOrderService.contactUser(userId);
+        //        storeOrderService.contactUser(userId);
         return Result.success();
     }
-
-//    @ApiOperation("批量发货")
-//    @PostMapping("/batchDelivery")
-//    public Result batchDelivery(@RequestBody List<StoreOrderDeliveryDTO> list) {
-//        storeOrderService.batchDelivery(list);
-//        return Result.success();
-//    }
-
+    
+    //    @ApiOperation("批量发货")
+    //    @PostMapping("/batchDelivery")
+    //    public Result batchDelivery(@RequestBody List<StoreOrderDeliveryDTO> list) {
+    //        storeOrderService.batchDelivery(list);
+    //        return Result.success();
+    //    }
+    
     @ApiOperation(value = "预下单")
     @PostMapping(value = "/pre/order")
     public Result preOrder(@RequestBody @Validated PreOrderRequest request) {
         Long tokenUserId = AuthService.getTokenUserId(null);
         request.setUserId(tokenUserId);
         return Result.success(storeOrderService.preOrder(request));
-
+        
     }
+    
     @ApiOperation(value = "加载预下单")
     @PostMapping(value = "load/pre")
     public Result<PreOrderResponse> loadPreOrder(@RequestParam String preOrderNo) {
-
+        
         Long tokenUserId = AuthService.getTokenUserId(null);
         return Result.success(storeOrderService.loadPreOrder(preOrderNo));
     }
-
+    
     @ApiOperation(value = "计算订单价格")
     @PostMapping(value = "/computed/price")
     public Result<ComputedOrderPriceResponse> computedPrice(@Validated @RequestBody OrderComputedPriceRequest request) {
-
+        
         Long tokenUserId = AuthService.getTokenUserId(null);
         request.setUserId(tokenUserId);
         return Result.success(storeOrderService.computedOrderPrice(request));
     }
-
+    
     @ApiOperation(value = "去支付")
     @PostMapping(value = "/goPay")
     public Result getPayResult(@RequestBody GoPinkDTO dto) {
-
+        
         Long tokenUserId = AuthService.getTokenUserId(null);
         dto.setUserId(tokenUserId);
         Boolean result = storeOrderService.goPay(dto);
         return Result.success(result);
     }
-
-//    @ApiOperation("导出发货单")
-//    @PostMapping("/exportDelivery")
-//    public Result exportDelivery(HttpServletResponse response) {
-//        storeOrderService.exportDelivery(response);
-//        return Result.success();
-//    }
-
-//    @ApiOperation("导入发货单")
-//    @PostMapping("/importDelivery")
-//    public Result importDelivery(@JSONField(serialize = false) @RequestParam("file") MultipartFile file) {
-//        storeOrderService.importDelivery(file);
-//        return Result.success();
-//    }
+    
+    /**
+     * 商品轮播
+     */
+    @GetMapping("carousel/{productId:^\\d+$}")
+    public Result<List<ProductCarouselVO>> carousel(@PathVariable("productId") Long productId) {
+        return Result.success(storePinkService.carousel(productId));
+    }
+    
+    //    @ApiOperation("导出发货单")
+    //    @PostMapping("/exportDelivery")
+    //    public Result exportDelivery(HttpServletResponse response) {
+    //        storeOrderService.exportDelivery(response);
+    //        return Result.success();
+    //    }
+    
+    //    @ApiOperation("导入发货单")
+    //    @PostMapping("/importDelivery")
+    //    public Result importDelivery(@JSONField(serialize = false) @RequestParam("file") MultipartFile file) {
+    //        storeOrderService.importDelivery(file);
+    //        return Result.success();
+    //    }
 }