优化

carbon-h5/carbon-h5-service/src/main/java/com/hcloud/microserver/h5/bo/CredentialInfoBO.java

@@ -53,4 +53,9 @@ public class CredentialInfoBO {
      * 订单金额
      */
     private BigDecimal OrderAmount;
+
+    /**
+     * 年度
+     */
+    private String year;
 }

carbon-h5/carbon-h5-service/src/main/java/com/hcloud/microserver/h5/controller/web/CustomerCarbonValController.java

@@ -30,7 +30,7 @@ public class CustomerCarbonValController extends CarbonBaseController {
 
     @ApiOperation(value = "排行榜",notes = "排行榜")
     @ApiImplicitParams({
-            @ApiImplicitParam(name = "type",value = "类型 1：企业排行榜 2:个人排行榜", dataType = "int")
+            @ApiImplicitParam(name = "type",value = "类型 1：个人排行榜 2:企业排行榜", dataType = "int")
     })
     @ApiResponse(code =0,message = "查询成功")
     @GetMapping("/getCustomerCarbonValRank")

carbon-h5/carbon-h5-service/src/main/resources/com/hcloud/microserver/h5/dao/GoodsCredentialInfoMapper.xml

@@ -52,7 +52,9 @@
         bb.customer_name AS customerName,
         bb.nick_name AS nickName,
         cc.company_name AS companyName,
-        dd.order_amount AS OrderAmount
+        dd.order_amount AS OrderAmount,
+        aa.farmer_names AS farmerName,
+        YEAR(aa.buy_date) AS year
     FROM
         t_goods_credential_info aa
     LEFT JOIN t_goods_order_info dd ON aa.fk_order_id = dd.guid