Merge remote-tracking branch 'origin/master'

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

@@ -130,6 +130,8 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, OrderInfo> implem
             orderInfo.setPayment(new BigDecimal(payInfo.getPayment()));
             //rebate_status  返佣状态
             orderInfo.setRebateStatus(0);
+            //level_status  升级状态
+            orderInfo.setLevelStatus(0);
             //month_order_status  //当月订单处理状态
             orderInfo.setMonthOrderStatus(0);
             //monthly_task_status  //月度任务处理状态

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);

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

@@ -34,6 +34,7 @@ import java.util.Map;
 
 /**
  * Created by m1991 on 2021/3/2 13:35
+ * @author 86187
  */
 @Api(tags = "登录/注册")
 @Slf4j
@@ -48,16 +49,13 @@ public class LoginController {
     @Autowired
     private UserService usersService;
 
-//        @Autowired
-//        private Result result;
-
     /**
      * 手机登录接口
      *
-     * @param userId
-     * @param sms
-     * @return
-     * @throws Exception
+     * @param userId 用户id
+     * @param sms 短信验证码
+     * @return 返回结果
+     * @throws Exception 异常
      */
 
     @ApiOperation(value = "登录", notes = "登录", httpMethod = "POST", produces = "application/json;charset=UTF-8")
@@ -74,7 +72,6 @@ public class LoginController {
 
             map.put("code", "1003");
             map.put("msg", "验证码错误");
-//            throw new BaseException(ResultEnum.FAIL_VERIFY);
             return map;
         }
         redisUtils.delete(key);
@@ -197,7 +194,7 @@ public class LoginController {
     /**
      * 退出登录
      *
-     * @param request
+     * @param token
      * @return
      */
     @ApiOperation(value = "退出登录", produces = "application/json", notes = "退出登录")

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

+package cn.wisenergy.web.admin.controller.app;
+
+import cn.wisenergy.common.utils.R;
+import cn.wisenergy.service.app.MonthTaskService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * @author 86187
+ */
+@Api(tags = "月度任务管理")
+@RestController
+@RequestMapping("/task")
+@Slf4j
+public class MonthTaskController {
+    @Autowired
+    private MonthTaskService monthTaskService;
+
+    @ApiOperation(value = "月度肥料--月定时任务", notes = "月度肥料--月定时任务", httpMethod = "GET")
+    @GetMapping("/monthManure")
+    public R<Boolean> monthManure() {
+        return monthTaskService.performanceCount();
+    }
+
+    @ApiOperation(value = "最大进步奖--月定时任务", notes = "最大进步奖--月定时任务", httpMethod = "GET")
+    @GetMapping("/growAward")
+    public R<Boolean> growAward() {
+        return monthTaskService.progressPrizeCount();
+    }
+
+    @ApiOperation(value = "", notes = "账户表镜像---每月更新一次，保存上一个的数据", httpMethod = "GET")
+    @GetMapping("/mirrorImage")
+    public R<String> mirrorImage() {
+        monthTaskService.mirrorImage();
+        return R.ok("success");
+    }
+
+
+}