优化：获取当前登录用户。

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

@@ -5,11 +5,12 @@ import com.hcloud.microserver.commoncore.base.ResultVO;
 import com.hcloud.microserver.commoncore.enums.ResultEnum;
 import com.hcloud.microserver.commoncore.exception.GlobalException;
 import com.hcloud.microserver.commoncore.util.string.StringUtils;
-import com.hcloud.microserver.h5.common.BaseInfoDO;
 import com.hcloud.microserver.h5.common.CarbonBaseController;
 import com.hcloud.microserver.h5.facade.carbon.forms.CustomerCarbonValRankForm;
+import com.hcloud.microserver.h5.facade.carbon.forms.CustomerInfoForm;
 import com.hcloud.microserver.h5.facade.carbon.vo.CustomerCarbonValRankVO;
 import com.hcloud.microserver.h5.service.CustomerCarbonValService;
+import com.hcloud.microserver.h5.service.CustomerService;
 import io.swagger.annotations.*;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.PostMapping;
@@ -26,6 +27,8 @@ public class CustomerCarbonValController extends CarbonBaseController {
 
     @Autowired
     private CustomerCarbonValService customerCarbonValService;
+    @Autowired
+    private CustomerService customerService;
 
     @ApiOperation(value = "排行榜",notes = "排行榜")
     @ApiImplicitParams({
@@ -38,15 +41,15 @@ public class CustomerCarbonValController extends CarbonBaseController {
             throw new GlobalException(ResultEnum.FAILURE.getCode(),"查询排行类型错误!");
         }
 
-        BaseInfoDO baseInfoDO = this.initiSaveObject();
-        if (baseInfoDO == null) {
+        CustomerInfoForm customerInfo = customerService.getCurrentMember();
+        if (customerInfo == null) {
             return responseError(new ResultVO(ResultEnum.TOKEN_EXPIRED));
         }
         if (StringUtils.isEmpty(form.getCustomerId())){
-            form.setCustomerId(baseInfoDO.getCustomerId());
+            form.setCustomerId(customerInfo.getGuid());
         }
         if (form.getCustomerType() == null){
-            form.setCustomerType(baseInfoDO.getCustomerType());
+            form.setCustomerType(customerInfo.getCustomerType());
         }
         CustomerCarbonValRankVO vo = customerCarbonValService.getCustomerCarbonValRankList(form);
         return responseResultSuccess(vo);

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

@@ -123,11 +123,11 @@ public class OrderManagerController extends CarbonBaseController {
     @PostMapping("/searchCredentialList")
     @AuthCarbonValidate
     public ResponseBase searchCredentialInfo(@RequestBody GoodsCredentialInfoForm goodsCredentialInfoForm) {
-        BaseInfoDO baseInfoDO = this.initiSaveObject();
-        if (baseInfoDO == null) {
+        CustomerInfoForm customerInfo = customerService.getCurrentMember();
+        if (customerInfo == null) {
             return responseError(new ResultVO(ResultEnum.TOKEN_EXPIRED));
         }
-        goodsCredentialInfoForm.setFkCustomerId(baseInfoDO.getCustomerId());
+        goodsCredentialInfoForm.setFkCustomerId(customerInfo.getGuid());
         PageInfo pageInfo = credentialInfoService.searchCredentialByPage(goodsCredentialInfoForm);
         ResultVO resultVO = success(pageInfo.getList(), pageInfo.getTotal());
         return responseSuccess(resultVO);