Merge remote-tracking branch 'origin/developer' into developer

haoban-manage3-operation-web/src/main/java/com/gic/haoban/manage/web/controller/EnterpriseController.java

@@ -20,6 +20,7 @@ import org.apache.commons.lang.StringUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
@@ -571,8 +572,8 @@ public class EnterpriseController extends WebBaseController {
     
     //微信企业绑定接口 - 迁移到运维
     @RequestMapping("wx-enterprise-bind")
-    public HaobanResponse wxEnterpriseBind(HttpServletRequest request , WxEnterpriseBindQo bindQo) {
-        if (org.apache.commons.lang3.StringUtils.isAnyBlank(bindQo.getEnterpriseId(), bindQo.getVersion())) {
+    public HaobanResponse wxEnterpriseBind(HttpServletRequest request , @RequestBody WxEnterpriseBindQo bindQo) {
+        if (org.apache.commons.lang3.StringUtils.isAnyBlank(bindQo.getEnterpriseId())) {
             return resultResponse(HaoBanErrCode.ERR_2);
         }
         String wxEnterpriseId = bindQo.getWxEnterpriseId();
@@ -585,7 +586,7 @@ public class EnterpriseController extends WebBaseController {
         detailDTO.setWxEnterpriseRelatedId(bindQo.getWxEnterpriseRelatedId());
         detailDTO.setEnterpriseId(bindQo.getEnterpriseId());
         detailDTO.setWxEnterpriseId(wxEnterpriseId);
-        detailDTO.setStaffId(null);
+        detailDTO.setStaffId("-1");
         detailDTO.setStaffName(staffName);
         detailDTO.setMemberOpenCardFlag(bindQo.getMemberOpenCardFlag());
         detailDTO.setWxEnterpriseType(bindQo.getWxEnterpriseType());

haoban-manage3-web/src/main/java/com/gic/haoban/manage/web/controller/LoginController.java

@@ -133,6 +133,15 @@ public class LoginController extends WebBaseController {
             return this.fail("企微下无管理GIC商户");
         }
         String gicEnterpriseId = list.get(0).getEnterpriseId();
+        HaobanUserDTO dto =  this.haobanUserApiService.selectByPhone(wxEnterpriseId,loginPhoneNumber) ;
+        if(null != dto && StringUtils.isNotBlank(dto.getDefaultGicEid())) {
+            for(EnterpriseDetailDTO item : list) {
+                if(item.getEnterpriseId().equals(dto.getDefaultGicEid())) {
+                    gicEnterpriseId = item.getEnterpriseId() ;
+                }
+            }
+        }
+        logger.info("登录商户={}",gicEnterpriseId);
         String code = this.doLogin(wxEnterpriseId, gicEnterpriseId, loginPhoneNumber, "gic", response);
         if (StringUtils.isNotBlank(code)) {
             return this.fail(this.errMessage(code));