Merge branch 'developer' of…

Merge branch 'developer' of http://115.159.76.241/base_platform_enterprise/gic-platform-enterprise into developer

gic-platform-enterprise-web/src/main/java/com/gic/enterprise/web/controller/wm/WmMallStoreController.java

@@ -317,9 +317,8 @@ public class WmMallStoreController {
     @RequestMapping("auth-callback")
     @ResponseBody
     public void authCallBack(String code, Integer wmMallStoreId) throws IOException {
-        Integer enterpriseId = UserDetailUtils.getUserDetail().getEnterpriseId();
         try {
-            ServiceResponse<Void> authWmResponse = weimobMerchantService.weimobStoreAuth(enterpriseId, code);
+            ServiceResponse<Void> authWmResponse = weimobMerchantService.weimobStoreAuth(wmMallStoreId, code);
             LOGGER.info("微盟中间件返回结果：{}", JSON.toJSONString(authWmResponse));
             if (authWmResponse.isSuccess()) {
                 //更新gic侧店铺授权状态

gic-platform-operation-web/src/main/java/com/gic/operation/web/controller/LoginController.java

@@ -119,6 +119,11 @@ public class LoginController {
                 ServiceResponse<Integer> saveResult = userApiService.saveOperationUser(temp);
                 user = temp;
                 user.setUserId(saveResult.getResult());
+            } else {
+                //更新运营人名称
+                if (!user.getUserName().equals(userDetailsVO.getRealName())) {
+                    userApiService.updateOperationUser(user.getUserId(), userDetailsVO.getRealName());
+                }
             }
 
             //gic用户信息塞入

gic-platform-operation-web/src/main/java/com/gic/operation/web/controller/MenuController.java

@@ -41,6 +41,12 @@ public class MenuController {
     @Autowired
     private ServeApiService serveApiService;
 
+    @RequestMapping("/sync-product-menu")
+    public RestResponse syncProductMenu(String menuCode) {
+        return RestResponse.success();
+    }
+
+
     /**
      * 新增GIC页面
      * @Title: saveGICPage