Merge remote-tracking branch 'origin/master'

# Conflicts:
#	src/main/java/com/ycwl/basic/service/impl/pc/OrderServiceImpl.java
#	src/main/java/com/ycwl/basic/service/pc/OrderService.java

src/main/java/com/ycwl/basic/controller/mobile/AppGoodsController.java

@@ -0,0 +1,50 @@
+package com.ycwl.basic.controller.mobile;
+
+import com.ycwl.basic.model.mobile.goods.GoodsPriceQueryReq;
+import com.ycwl.basic.model.mobile.goods.GoodsReqQuery;
+import com.ycwl.basic.model.mobile.goods.GoodsVO;
+import com.ycwl.basic.model.pc.source.resp.SourceRespVO;
+import com.ycwl.basic.service.mobile.GoodsService;
+import com.ycwl.basic.utils.ApiResponse;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.util.List;
+
+/**
+ * @Author：longbinbin
+ * @Date：2024/12/5 14:49
+ * 成片（video）和源素材（source）都可作为商品，订单中可购买多个
+ */
+@RestController
+@RequestMapping("/api/mobile/goods/v1")
+@Api(tags = "商品相关接口")
+public class AppGoodsController {
+
+    @Autowired
+    private GoodsService goodsService;
+
+    @ApiOperation("商品列表")
+    @PostMapping("/goodsList")
+    public ApiResponse<List<GoodsVO>> goodsList(@RequestBody GoodsReqQuery query) {
+        return goodsService.goodsList(query);
+    }
+
+    @ApiOperation("源素材(原片/照片)商品列表")
+    @PostMapping("/sourceGoodsList")
+    public ApiResponse<List<SourceRespVO>> sourceGoodsList(@RequestBody GoodsReqQuery query) {
+        return goodsService.sourceGoodsList(query);
+    }
+
+    @ApiOperation("查询价格")
+    @PostMapping("/queryPrice")
+    public ApiResponse queryPrice(@RequestBody GoodsPriceQueryReq queryPriceData) {
+        //TODO 处理购买逻辑
+        return goodsService.queryPrice(queryPriceData);
+    }
+}

src/main/java/com/ycwl/basic/controller/mobile/AppOrderController.java

@@ -1,5 +1,6 @@
 package com.ycwl.basic.controller.mobile;
 
+import com.ycwl.basic.annotation.IgnoreToken;
 import com.ycwl.basic.model.pc.order.req.OrderAddOrUpdateReq;
 import com.ycwl.basic.model.pc.order.req.OrderReqQuery;
 import com.ycwl.basic.service.pc.OrderService;
@@ -9,6 +10,8 @@ import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
+import java.math.BigDecimal;
+
 /**
  * @Author：longbinbin
  * @Date：2024/12/4 17:16
@@ -23,14 +26,17 @@ public class AppOrderController {
 
     @ApiOperation("用户端订单列表查询")
     @PostMapping("/page")
+    @IgnoreToken
     public ApiResponse pageQuery(@RequestBody OrderReqQuery orderReqQuery) {
         //TODO 添加用户openid查询条件,仅查询当前用户自己的订单
-        return orderService.pageQuery(orderReqQuery);
+
+        return orderService.appPageQuery(orderReqQuery);
     }
     @ApiOperation("用户端订单详情查询")
     @GetMapping("getOrderDetails/{id}")
+    @IgnoreToken
     public ApiResponse getOrderDetails(@PathVariable("id") Long id) {
-        return orderService.detail(id);
+        return orderService.appDetail(id);
     }
 
     @ApiOperation("用户端订单新增")
@@ -46,4 +52,14 @@ public class AppOrderController {
         //TODO 处理购买逻辑
         return ApiResponse.success("");
     }
+
+    @ApiOperation("获取用户订单数量")
+    @GetMapping("/getUserOrderCount")
+    public ApiResponse getUserOrderCount() {
+        //TODO 获取用户信息
+        Long userId = 1L;
+
+        return orderService.getOrderCountByUserId(userId);
+    }
+
 }