Merge remote-tracking branch 'origin/master'

whepi-web/src/main/java/com/bofeng/service/HomeService.java

@@ -54,6 +54,17 @@ public class HomeService {
             userOpenMapper.insert(userOpen);
             return userOpen;
         }
+        if (!user.getNickName().equals(wxMpUser.getNickname())) {
+            user.setOpenId(wxMpUser.getOpenId());
+            user.setNickName(wxMpUser.getNickname());
+            user.setSexDesc(wxMpUser.getSexDesc());
+            user.setSex(wxMpUser.getSex());
+            user.setCity(wxMpUser.getCity());
+            user.setProvince(wxMpUser.getProvince());
+            user.setCountry(wxMpUser.getCountry());
+            user.setHeadImgUrl(wxMpUser.getHeadImgUrl());
+            userOpenMapper.updateById(user);
+        }
         return user;
     }
 }

whepi-web/src/main/java/com/bofeng/wx/controller/ShopMatController.java

@@ -6,13 +6,10 @@ import com.bofeng.service.ShShopService;
 import com.yvan.Model;
 import com.yvan.ModelOps;
 import com.yvan.mvc.Pd;
-import com.yvan.platform.JsonWapper;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.ui.ModelMap;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RestController;
-import org.springframework.web.servlet.ModelAndView;
 
 import java.util.List;
 
@@ -43,19 +40,19 @@ public class ShopMatController {
 
 
     //商品的新增
-    @PostMapping("/shop/shop/addShShopMat")
+    @PostMapping("/shop/mat/addShShopMat")
     public ModelOps addShShopMat(@Pd(name = "userId") Long userId, @Pd(name = "matName") String matName, @Pd(name = "matNum") Integer matNum) throws Exception {
         return ModelOps.newSuccess(shShopMatService.addShShopMat(userId, matName, matNum));
     }
 
     //商品的置顶2、下架0修改
-    @PostMapping("/shop/shop/editShShopMatStatus")
+    @PostMapping("/shop/mat/editShShopMatStatus")
     public ModelOps editShShopMatStatus(@Pd(name = "matId") Long matId, @Pd(name = "status") Integer status) throws Exception {
         return ModelOps.newSuccess(shShopMatService.editShShopMatStatus(matId, status));
     }
 
     //    //我的商品
-    @GetMapping("/shop/shop/queryMyShShopMat")
+    @GetMapping("/shop/mat/queryMyShShopMat")
     public Model<List<ShShopMat>> queryMyShShopMat(@Pd(name = "userId"/*, required = false*/) Long userId) throws Exception {
         return Model.newSuccess(shShopMatService.queryMyShShopMat(userId));
     }

whepi-web/src/main/java/com/bofeng/wx/controller/UserOpenController.java

@@ -2,10 +2,9 @@ package com.bofeng.wx.controller;
 
 import com.bofeng.dao.*;
 import com.bofeng.entity.*;
-import com.bofeng.service.HomeService;
-import com.bofeng.service.QzTaskService;
-import com.bofeng.service.RbService;
-import com.bofeng.service.UserOpenService;
+import com.bofeng.service.*;
+import com.fasterxml.jackson.core.JsonProcessingException;
+import com.yvan.platform.JsonWapper;
 import com.yvan.platform.YvanUtil;
 import com.yvan.springmvc.ResultModel;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -43,15 +42,18 @@ public class UserOpenController {
     private QzTaskService qzTaskService;
     @Autowired
     private RbService rbService;
+    @Autowired
+    private MsReportService msReportService;
 
     @GetMapping("/user/home.html")
-    public ModelAndView home(ModelMap model, @RequestParam(value = "userId", required = false,defaultValue = "0") Long userId) {
+    public ModelAndView home(ModelMap model, @RequestParam(value = "userId", required = false,defaultValue = "0") Long userId) throws JsonProcessingException {
         List<UserRole> list = new ArrayList<>();
         if (userId == 0) {
-          /*  UserOpen userOpen = homeService.getUserOpen();
-            list = userRoleMapper.getUserRoleByUserId(userOpen.getUserId());*/
-            list = userRoleMapper.getUserRoleByUserId(1224239062748065800L);
-            UserOpen userOpen = userOpenMapper.selectByUserId(1224239062748065800L);
+            UserOpen userOpen = homeService.getUserOpen();
+            list = userRoleMapper.getUserRoleByUserId(userOpen.getUserId());
+//            list = userRoleMapper.getUserRoleByUserId(1224239062748065800L);
+//            UserOpen userOpen = userOpenMapper.selectByUserId(1224239062748065800L);
+            userId = userOpen.getUserId();
             model.put("user", userOpen);
             model.put("user_id", "\""+userOpen.getUserId()+"\"");
         } else {
@@ -63,6 +65,8 @@ public class UserOpenController {
             return new ModelAndView("/user/home.ftl", model);
         } else if (list.size()>0) {
             if (list.get(0).getRoleId() == 1) {
+                MsReport msReport =msReportService.getReportByDateNow(userId);
+                model.put("msReport", new JsonWapper(msReport));
                 return new ModelAndView("/home/home.ftl", model);
             } else if(list.get(0).getRoleId() == 2) {
                 List<QzTask> taskList = qzTaskService.selectAll();