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

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

@@ -36,6 +36,6 @@ public class CategoryController {
      */
     @PostMapping("/categories")
     public List<CategoryVO> listCategories(@RequestBody @Valid CategoryListParam param) {
-        return CategoryCopier.INSTANCE.copying(this.categoryService.listActiveCategories(param));
+        return CategoryCopier.INSTANCE.copying(this.categoryService.listCategory(param));
     }
 }

src/main/java/com/chelvc/cloud/maintain/controller/CurrencyRecordController.java

@@ -0,0 +1,52 @@
+package com.chelvc.cloud.maintain.controller;
+import com.chelvc.cloud.vehicle.api.dto.CarouselImagesDTO;
+import com.chelvc.cloud.vehicle.api.dto.CurrencyRecordDTO;
+import com.chelvc.cloud.vehicle.api.service.CarouselImagesService;
+import com.chelvc.cloud.vehicle.api.service.CurrencyRecordService;
+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 java.util.List;
+import java.util.Map;
+
+/**
+ * 收益记录接口
+ *
+ * @author liude
+ * @date 2023/4/20
+ */
+@Validated
+@RestController
+@ResponseWrapping
+public class CurrencyRecordController {
+    @DubboReference
+    private CurrencyRecordService currencyRecordService;
+
+    /**
+     * 用户收益记录列表查询
+     *
+     * @param
+     */
+    @GetMapping("/listCurrencyRecord")
+    public List<CurrencyRecordDTO> listCurrencyRecord() {
+        return this.currencyRecordService.listCurrencyRecord();
+    }
+
+    /**
+     * 用户获取用户得总收益、本周收益、本月收益、可提现金额
+     *
+     * @param
+     */
+    @GetMapping("/getCurrencyRecord")
+    public Map<String,Object> getCurrencyRecord() {
+        return this.currencyRecordService.getCurrencyRecord();
+    }
+
+
+
+
+
+}

src/main/java/com/chelvc/cloud/maintain/vo/PersonalVO.java

@@ -1,6 +1,7 @@
 package com.chelvc.cloud.maintain.vo;
 
 import java.io.Serializable;
+import java.util.Date;
 
 import com.chelvc.cloud.uc.api.model.Gender;
 import com.chelvc.framework.common.serializer.JacksonEnumerateSerializer;
@@ -41,4 +42,9 @@ public class PersonalVO implements Serializable {
      * 用户昵称
      */
     private String nickname;
+
+    /**
+     * 用户生日
+     */
+    private Date birthday;
 }