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

src/main/java/com/chelvc/cloud/admin/controller/CategoryController.java

@@ -99,4 +99,15 @@ public class CategoryController {
     public List<CategoryDTO> getRootCategories(@RequestBody @Valid CategoryListParam param) {
         return this.categoryService.getRootCategories(param);
     }
+
+
+    /**
+     * 获取一级分类列表
+     *
+     * @return 分类信息列表
+     */
+    @PostMapping("/getParentCategories")
+    public List<CategoryDTO> getParentCategories(@RequestBody @Valid CategoryListParam param) {
+        return this.categoryService.getParentCategories(param);
+    }
 }

src/main/java/com/chelvc/cloud/admin/controller/GoodsController.java

@@ -12,6 +12,8 @@ import org.springframework.web.bind.annotation.*;
 
 import javax.validation.Valid;
 import javax.validation.constraints.Min;
+import java.util.List;
+import java.util.Map;
 
 /**
  * 商品接口
@@ -69,4 +71,13 @@ public class GoodsController {
     public Pagination<GoodsDTO> getGoodsPaging(@Valid GoodsPagingParam param) {
         return this.goodsService.getGoodsPaging(param);
     }
+
+    /**
+     * 查询商品得成交量以及成交金额
+     *
+     */
+    @GetMapping("/goods/orderAmount")
+    public List<Map<String,Object>> orderAmount() {
+        return this.goodsService.getGoodsAmount();
+    }
 }

src/main/java/com/chelvc/cloud/admin/controller/InviteUserController.java

@@ -0,0 +1,36 @@
+package com.chelvc.cloud.admin.controller;
+import com.chelvc.cloud.vehicle.api.dto.TeamDTO;
+import com.chelvc.cloud.vehicle.api.param.TeamInvitePageParam;
+import com.chelvc.cloud.vehicle.api.service.UserInviteService;
+import com.chelvc.framework.base.annotation.ResponseWrapping;
+import org.apache.dubbo.config.annotation.DubboReference;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import javax.validation.Valid;
+
+/**
+ * 用户分销接口
+ *
+ * @author liude
+ * @date 2024/4/30
+ */
+@Validated
+@RestController
+@ResponseWrapping
+public class InviteUserController {
+    @DubboReference
+    private UserInviteService userInviteService;
+
+    /**
+     * 查询用户分销分页
+     *
+     * @param param 查询参数
+     * @return 用户分销分页信息
+     */
+    @GetMapping("/userInvite/paging")
+    public TeamDTO getUserInvitePaging(@Valid TeamInvitePageParam param) {
+        return this.userInviteService.inviteList(param);
+    }
+}

src/main/java/com/chelvc/cloud/admin/controller/MerchantController.java

@@ -7,6 +7,7 @@ import javax.validation.constraints.Min;
 import javax.validation.constraints.NotEmpty;
 
 import com.chelvc.cloud.vehicle.api.constant.GoodsStatus;
+import com.chelvc.cloud.vehicle.api.constant.MerchantStatus;
 import com.chelvc.cloud.vehicle.api.dto.MerchantDTO;
 import com.chelvc.cloud.vehicle.api.dto.MerchantRankDTO;
 import com.chelvc.cloud.vehicle.api.param.MerchantModifyParam;
@@ -128,7 +129,7 @@ public class MerchantController {
      */
     @GetMapping("/merchants/rank")
     public List<MerchantRankDTO> listRankMerchants(@Valid MerchantRankParam param) {
-        return this.merchantService.listRankMerchants(param, SessionContextHolder.getId());
+        return this.merchantService.listRankMerchants(param);
     }
 
 
@@ -151,4 +152,16 @@ public class MerchantController {
     public List<Map<String,Object>> operatReport(@RequestBody @Valid ReportModifyParam param) {
         return this.merchantService.operatReport(param);
     }
+
+    /**
+     * 商家审核
+     *
+     * @param id    商家主键
+     * @param
+     */
+    @GetMapping("/merchantAudit/{id}")
+    public void merchantAudit(@PathVariable("id") @Min(value = 1, message = "商家主键不能小于1") Long id,
+                              MerchantStatus status ) {
+        this.merchantService.merchantAudit(id, status);
+    }
 }

src/main/java/com/chelvc/cloud/admin/controller/OrderController.java

@@ -13,6 +13,7 @@ import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.RestController;
 import javax.validation.Valid;
 import javax.validation.constraints.Min;
+import javax.validation.constraints.NotNull;
 
 /**
  * 订单接口
@@ -49,4 +50,17 @@ public class OrderController {
     public OmsOrderDetailDTO getOrderDetail(@PathVariable("id") @Min(value = 1, message = "主键不能小于1") Long id) {
         return this.orderService.detail(id);
     }
+
+    /**
+     *
+     * 核验订单
+     * @param orderId
+     * @param merchantId
+     * @return
+     */
+    @GetMapping("/order/verification/{orderId}/{merchantId}")
+    public void orderVerification(@PathVariable("orderId") @NotNull(message = "订单错误") Long orderId,
+                                  @PathVariable("merchantId") @NotNull(message = "订单错误") Long merchantId) {
+        this.orderService.orderVerification(orderId, merchantId);
+    }
 }