森林状态bug修复用户没有下单时查询订单表null指针异常

wisenergy-service/src/main/java/cn/wisenergy/service/app/impl/UserForestStatusServiceImpl.java

@@ -76,6 +76,9 @@ public class UserForestStatusServiceImpl implements UserForestStatusService {
             //用户等级 < 幼苗 显示业绩缺少额度
             //获取当前用户的业绩
             BigDecimal performanceByUserid = orderMapper.getPerformanceByUserid(userId);
+            if (performanceByUserid == null){
+                performanceByUserid = new BigDecimal(0);
+            }
             //距离升级还差多少额度
             BigDecimal differenceAmount = levelTerm.subtract(performanceByUserid);
             difference.put("differenceAmount",differenceAmount);
@@ -134,7 +137,6 @@ public class UserForestStatusServiceImpl implements UserForestStatusService {
             difference.put("teamDifferenceBronze",teamDifferenceBronze);
             userForestStatusMap.put("differenceMap",difference);
 
-
         }else if (userLevel == 4){
             //用户等级为黄金树
 

wisenergy-web-admin/src/main/java/cn/wisenergy/web/admin/controller/app/CustomerServiceController.java

@@ -26,9 +26,14 @@ public class CustomerServiceController {
     @Autowired
     private CustomerServiceService customerServiceService;
 
+    /**
+     * 给用户分配专属客服
+     * @param userId
+     * @return
+     */
     @ApiOperation(value = "获取专属客服", notes = "获取专属客服")
     @GetMapping("/service")
-    public R getServiceByRand(String userId){
+    public R<String> getServiceByRand(String userId){
         try {
             CustomerService serviceByRand = customerServiceService.getServiceByRand(userId);
             String wechatImgUrl = serviceByRand.getWechatImgUrl();
@@ -39,12 +44,16 @@ public class CustomerServiceController {
     }
 
     /**
-     * String wechatId ,@RequestParam("file") MultipartFile file,
-     * 上传专属客服微信二维码图片
+     *  上传专属客服的二维码图片及微信ID
+     * @param file  图片文件
+     * @param request
+     * @param wechatId   微信ID
+     * @return
      */
+    @ApiOperation(value = "设置专属客服二维码图片及微信id", notes = "设置专属客服二维码图片及微信id")
     @ResponseBody
     @PostMapping("/uploadWeChatImg")
-    public R uploadWeChatQRImg(@RequestParam("file")MultipartFile file,HttpServletRequest request,String wechatId){
+    public R<String> uploadWeChatQRImg(@RequestParam("file")MultipartFile file,HttpServletRequest request,String wechatId){
 
         try {
             customerServiceService.uploadImage(file,request,wechatId);