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

gic-platform-auth-api/src/main/java/com/gic/auth/dto/UnionEnterpriseDTO.java

@@ -22,6 +22,9 @@ public class UnionEnterpriseDTO implements Serializable {
      * 
      */
     private String unionEnterpriseName;
+    private String unionCompanyName;
+    private String unionManagerName;
+    private String unionManagerPhone;
 
     /**
      *
@@ -141,4 +144,28 @@ public class UnionEnterpriseDTO implements Serializable {
     public void setResourceList(List<UnionEnterpriseResourceDTO> resourceList) {
         this.resourceList = resourceList;
     }
+
+    public String getUnionCompanyName() {
+        return unionCompanyName;
+    }
+
+    public void setUnionCompanyName(String unionCompanyName) {
+        this.unionCompanyName = unionCompanyName;
+    }
+
+    public String getUnionManagerName() {
+        return unionManagerName;
+    }
+
+    public void setUnionManagerName(String unionManagerName) {
+        this.unionManagerName = unionManagerName;
+    }
+
+    public String getUnionManagerPhone() {
+        return unionManagerPhone;
+    }
+
+    public void setUnionManagerPhone(String unionManagerPhone) {
+        this.unionManagerPhone = unionManagerPhone;
+    }
 }
\ No newline at end of file

gic-platform-auth-web/src/main/java/com/gic/auth/web/controller/UnionEnterpriseController.java

@@ -5,8 +5,10 @@ import com.gic.api.base.commons.ServiceResponse;
 import com.gic.auth.dto.AuthCodeDTO;
 import com.gic.auth.dto.UnionEnterpriseDTO;
 import com.gic.auth.dto.UnionEnterpriseResourceDTO;
+import com.gic.auth.dto.UserDTO;
 import com.gic.auth.service.AuthCodeApiService;
 import com.gic.auth.service.UnionEnterpriseApiService;
+import com.gic.auth.service.UserApiService;
 import com.gic.auth.web.qo.PageQO;
 import com.gic.auth.web.qo.StoreResouceQO;
 import com.gic.auth.web.qo.UnionEnterpriseQO;
@@ -41,6 +43,8 @@ public class UnionEnterpriseController {
     private StoreWidgetApiService storeWidgetApiService;
     @Autowired
     private GoodsRightsSelectorApiService goodsRightsSelectorApiService;
+    @Autowired
+    private UserApiService userApiService;
 
     @RequestMapping("save-union-enterprise")
     public RestResponse saveUnionEnterprise(@RequestBody UnionEnterpriseQO unionEnterpriseQO){
@@ -128,6 +132,13 @@ public class UnionEnterpriseController {
                 for(UnionEnterpriseDTO dto : list){
                     ServiceResponse<List<UnionEnterpriseResourceDTO>> response = this.unionEnterpriseApiService.listResourceByUnionId(dto.getUnionId());
                     dto.setResourceList(response.getResult());
+                    dto.setUnionCompanyName(UserDetailUtils.getUserDetail().getEnterpriseInfo().getCompanyName());
+                    ServiceResponse<UserDTO> userResponse = this.userApiService.getUserByEnterpriseId(enterpriseId);
+                    if(userResponse.isSuccess()){
+                        dto.setUnionManagerName(userResponse.getResult().getUserName());
+                        dto.setUnionManagerPhone(userResponse.getResult().getPhoneNumber());
+                    }
+
                 }
             }
             return RestResponse.success(result);

gic-platform-auth-web/src/main/java/com/gic/auth/web/vo/UnionEnterpriseVO.java

@@ -8,10 +8,11 @@ import java.io.Serializable;
 public class UnionEnterpriseVO implements Serializable {
     private Integer unionEnterpriseId;
     private String unionEnterpriseName;
+    private String unionCompanyName;
+    private String unionManagerName;
+    private String unionManagerPhone;
     private String authCode;
-    private Long memberCardResourceId;
-    private Long fwhResourceId;
-    private Long appletResourceId;
+    private Long memberResourceId;
     private StoreResouceVO storeResouce;
     private GoodsResouceVO goodsResouce;
     private Long orderResourceId;
@@ -58,30 +59,6 @@ public class UnionEnterpriseVO implements Serializable {
         this.unionId = unionId;
     }
 
-    public Long getMemberCardResourceId() {
-        return memberCardResourceId;
-    }
-
-    public void setMemberCardResourceId(Long memberCardResourceId) {
-        this.memberCardResourceId = memberCardResourceId;
-    }
-
-    public Long getFwhResourceId() {
-        return fwhResourceId;
-    }
-
-    public void setFwhResourceId(Long fwhResourceId) {
-        this.fwhResourceId = fwhResourceId;
-    }
-
-    public Long getAppletResourceId() {
-        return appletResourceId;
-    }
-
-    public void setAppletResourceId(Long appletResourceId) {
-        this.appletResourceId = appletResourceId;
-    }
-
     public Long getOrderResourceId() {
         return orderResourceId;
     }
@@ -105,4 +82,36 @@ public class UnionEnterpriseVO implements Serializable {
     public void setGoodsResouce(GoodsResouceVO goodsResouce) {
         this.goodsResouce = goodsResouce;
     }
+
+    public Long getMemberResourceId() {
+        return memberResourceId;
+    }
+
+    public void setMemberResourceId(Long memberResourceId) {
+        this.memberResourceId = memberResourceId;
+    }
+
+    public String getUnionCompanyName() {
+        return unionCompanyName;
+    }
+
+    public void setUnionCompanyName(String unionCompanyName) {
+        this.unionCompanyName = unionCompanyName;
+    }
+
+    public String getUnionManagerName() {
+        return unionManagerName;
+    }
+
+    public void setUnionManagerName(String unionManagerName) {
+        this.unionManagerName = unionManagerName;
+    }
+
+    public String getUnionManagerPhone() {
+        return unionManagerPhone;
+    }
+
+    public void setUnionManagerPhone(String unionManagerPhone) {
+        this.unionManagerPhone = unionManagerPhone;
+    }
 }