Commit 9ffc5382 authored by codezwjava's avatar codezwjava

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

parent 4660ffb6
...@@ -76,6 +76,9 @@ public class UserForestStatusServiceImpl implements UserForestStatusService { ...@@ -76,6 +76,9 @@ public class UserForestStatusServiceImpl implements UserForestStatusService {
//用户等级 < 幼苗 显示业绩缺少额度 //用户等级 < 幼苗 显示业绩缺少额度
//获取当前用户的业绩 //获取当前用户的业绩
BigDecimal performanceByUserid = orderMapper.getPerformanceByUserid(userId); BigDecimal performanceByUserid = orderMapper.getPerformanceByUserid(userId);
if (performanceByUserid == null){
performanceByUserid = new BigDecimal(0);
}
//距离升级还差多少额度 //距离升级还差多少额度
BigDecimal differenceAmount = levelTerm.subtract(performanceByUserid); BigDecimal differenceAmount = levelTerm.subtract(performanceByUserid);
difference.put("differenceAmount",differenceAmount); difference.put("differenceAmount",differenceAmount);
...@@ -134,7 +137,6 @@ public class UserForestStatusServiceImpl implements UserForestStatusService { ...@@ -134,7 +137,6 @@ public class UserForestStatusServiceImpl implements UserForestStatusService {
difference.put("teamDifferenceBronze",teamDifferenceBronze); difference.put("teamDifferenceBronze",teamDifferenceBronze);
userForestStatusMap.put("differenceMap",difference); userForestStatusMap.put("differenceMap",difference);
}else if (userLevel == 4){ }else if (userLevel == 4){
//用户等级为黄金树 //用户等级为黄金树
......
...@@ -26,9 +26,14 @@ public class CustomerServiceController { ...@@ -26,9 +26,14 @@ public class CustomerServiceController {
@Autowired @Autowired
private CustomerServiceService customerServiceService; private CustomerServiceService customerServiceService;
/**
* 给用户分配专属客服
* @param userId
* @return
*/
@ApiOperation(value = "获取专属客服", notes = "获取专属客服") @ApiOperation(value = "获取专属客服", notes = "获取专属客服")
@GetMapping("/service") @GetMapping("/service")
public R getServiceByRand(String userId){ public R<String> getServiceByRand(String userId){
try { try {
CustomerService serviceByRand = customerServiceService.getServiceByRand(userId); CustomerService serviceByRand = customerServiceService.getServiceByRand(userId);
String wechatImgUrl = serviceByRand.getWechatImgUrl(); String wechatImgUrl = serviceByRand.getWechatImgUrl();
...@@ -39,12 +44,16 @@ public class CustomerServiceController { ...@@ -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 @ResponseBody
@PostMapping("/uploadWeChatImg") @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 { try {
customerServiceService.uploadImage(file,request,wechatId); customerServiceService.uploadImage(file,request,wechatId);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment