联合商户查询修改

gic-platform-auth-web/pom.xml

@@ -132,6 +132,11 @@
             <artifactId>gic-platform-enterprise-api</artifactId>
             <version>${gic-platform-enterprise-api}</version>
         </dependency>
+        <dependency>
+            <groupId>com.gic</groupId>
+            <artifactId>gic-goods-api</artifactId>
+            <version>${gic-goods-api}</version>
+        </dependency>
     </dependencies>
 
     <build>

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

@@ -9,6 +9,7 @@ import com.gic.auth.service.UnionEnterpriseApiService;
 import com.gic.auth.web.qo.PageQO;
 import com.gic.auth.web.qo.StoreResouceQO;
 import com.gic.auth.web.qo.UnionEnterpriseQO;
+import com.gic.auth.web.vo.GoodsResouceVO;
 import com.gic.auth.web.vo.StoreResouceVO;
 import com.gic.auth.web.vo.UnionEnterpriseVO;
 import com.gic.commons.util.EntityUtil;
@@ -16,6 +17,8 @@ import com.gic.commons.webapi.reponse.RestResponse;
 import com.gic.enterprise.error.ErrorCode;
 import com.gic.enterprise.response.EnterpriseRestResponse;
 import com.gic.enterprise.utils.UserDetailUtils;
+import com.gic.goods.api.dto.GoodsRightsSelectorDTO;
+import com.gic.goods.api.service.GoodsRightsSelectorApiService;
 import com.gic.store.dto.StoreWidgetDTO;
 import com.gic.store.service.StoreWidgetApiService;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -33,6 +36,8 @@ public class UnionEnterpriseController {
     private UnionEnterpriseApiService unionEnterpriseApiService;
     @Autowired
     private StoreWidgetApiService storeWidgetApiService;
+    @Autowired
+    private GoodsRightsSelectorApiService goodsRightsSelectorApiService;
 
     @RequestMapping("save-union-enterprise")
     public RestResponse saveUnionEnterprise(@RequestBody UnionEnterpriseQO unionEnterpriseQO){
@@ -50,15 +55,19 @@ public class UnionEnterpriseController {
         storeWidgetDTO.setStoreWidgetId(unionEnterpriseQO.getStoreResouce().getStoreResourceId());
         storeWidgetDTO.setWriteBackParam(unionEnterpriseQO.getStoreResouce().getWriteBackParam());
         ServiceResponse<Integer> storeWidgetResponse = this.storeWidgetApiService.saveAuthStoreWidget(storeWidgetDTO);
+        GoodsRightsSelectorDTO goodsRightsSelectorDTO = EntityUtil.changeEntityByJSON(GoodsRightsSelectorDTO.class, unionEnterpriseQO.getGoodsResouce());
+        ServiceResponse<GoodsRightsSelectorDTO> goodsResponse = this.goodsRightsSelectorApiService.saveGoodsRightsSelector(goodsRightsSelectorDTO);
         if(storeWidgetResponse.isSuccess()){
             enterpriseDTO.setStoreResourceId(storeWidgetResponse.getResult().longValue());
-            ServiceResponse<Integer> response = this.unionEnterpriseApiService.saveUnionEnterprise(enterpriseDTO);
-            if(response.isSuccess()){
-                return RestResponse.success(response.getResult());
-            }
-            return EnterpriseRestResponse.failure(response);
         }
-        return EnterpriseRestResponse.failure(storeWidgetResponse);
+        if(goodsResponse.isSuccess()){
+            enterpriseDTO.setGoodsResourceId(goodsResponse.getResult().getGoodsRightsSelectorId());
+        }
+        ServiceResponse<Integer> response = this.unionEnterpriseApiService.saveUnionEnterprise(enterpriseDTO);
+        if(response.isSuccess()){
+            return RestResponse.success(response.getResult());
+        }
+        return EnterpriseRestResponse.failure(response);
     }
 
     @RequestMapping("union-enterprise-detail")
@@ -80,6 +89,12 @@ public class UnionEnterpriseController {
                     vo.setStoreResouce(storeResouceVO);
                 }
             }
+            ServiceResponse<GoodsRightsSelectorDTO> goodsResponse = this.goodsRightsSelectorApiService.getGoodsRightsSelector(response.getResult().getGoodsResourceId());
+            if(goodsResponse.isSuccess()){
+                if(goodsResponse.getResult() != null){
+                    vo.setGoodsResouce(EntityUtil.changeEntityByJSON(GoodsResouceVO.class, goodsResponse.getResult()));
+                }
+            }
             return RestResponse.success(vo);
         }
         return EnterpriseRestResponse.failure(response);

gic-platform-auth-web/src/main/java/com/gic/auth/web/qo/GoodsResouceQO.java

+package com.gic.auth.web.qo;
+
+import java.io.Serializable;
+
+public class GoodsResouceQO implements Serializable {
+    private Long goodsRightsSelectorId;
+    private String goodsRightsSearchValue;
+    private String goodsRightsSearchText;
+    private Integer hasRights;
+
+    public Long getGoodsRightsSelectorId() {
+        return goodsRightsSelectorId;
+    }
+
+    public void setGoodsRightsSelectorId(Long goodsRightsSelectorId) {
+        this.goodsRightsSelectorId = goodsRightsSelectorId;
+    }
+
+    public String getGoodsRightsSearchValue() {
+        return goodsRightsSearchValue;
+    }
+
+    public void setGoodsRightsSearchValue(String goodsRightsSearchValue) {
+        this.goodsRightsSearchValue = goodsRightsSearchValue;
+    }
+
+    public String getGoodsRightsSearchText() {
+        return goodsRightsSearchText;
+    }
+
+    public void setGoodsRightsSearchText(String goodsRightsSearchText) {
+        this.goodsRightsSearchText = goodsRightsSearchText;
+    }
+
+    public Integer getHasRights() {
+        return hasRights;
+    }
+
+    public void setHasRights(Integer hasRights) {
+        this.hasRights = hasRights;
+    }
+}

gic-platform-auth-web/src/main/java/com/gic/auth/web/qo/UnionEnterpriseQO.java

@@ -10,7 +10,7 @@ public class UnionEnterpriseQO implements Serializable {
     private Long fwhResourceId;
     private Long appletResourceId;
     private StoreResouceQO storeResouce;
-    private Long goodsResourceId;
+    private GoodsResouceQO goodsResouce;
     private Long orderResourceId;
     private Integer authCodeId;
     private Integer unionId;
@@ -79,14 +79,6 @@ public class UnionEnterpriseQO implements Serializable {
         this.appletResourceId = appletResourceId;
     }
 
-    public Long getGoodsResourceId() {
-        return goodsResourceId;
-    }
-
-    public void setGoodsResourceId(Long goodsResourceId) {
-        this.goodsResourceId = goodsResourceId;
-    }
-
     public Long getOrderResourceId() {
         return orderResourceId;
     }
@@ -102,4 +94,12 @@ public class UnionEnterpriseQO implements Serializable {
     public void setStoreResouce(StoreResouceQO storeResouce) {
         this.storeResouce = storeResouce;
     }
+
+    public GoodsResouceQO getGoodsResouce() {
+        return goodsResouce;
+    }
+
+    public void setGoodsResouce(GoodsResouceQO goodsResouce) {
+        this.goodsResouce = goodsResouce;
+    }
 }

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

+package com.gic.auth.web.vo;
+
+import java.io.Serializable;
+
+public class GoodsResouceVO implements Serializable {
+    private Long goodsRightsSelectorId;
+    private String goodsRightsSearchValue;
+    private String goodsRightsSearchText;
+    private Integer hasRights;
+
+    public Long getGoodsRightsSelectorId() {
+        return goodsRightsSelectorId;
+    }
+
+    public void setGoodsRightsSelectorId(Long goodsRightsSelectorId) {
+        this.goodsRightsSelectorId = goodsRightsSelectorId;
+    }
+
+    public String getGoodsRightsSearchValue() {
+        return goodsRightsSearchValue;
+    }
+
+    public void setGoodsRightsSearchValue(String goodsRightsSearchValue) {
+        this.goodsRightsSearchValue = goodsRightsSearchValue;
+    }
+
+    public String getGoodsRightsSearchText() {
+        return goodsRightsSearchText;
+    }
+
+    public void setGoodsRightsSearchText(String goodsRightsSearchText) {
+        this.goodsRightsSearchText = goodsRightsSearchText;
+    }
+
+    public Integer getHasRights() {
+        return hasRights;
+    }
+
+    public void setHasRights(Integer hasRights) {
+        this.hasRights = hasRights;
+    }
+}

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

 package com.gic.auth.web.vo;
 
 
+import com.gic.auth.web.qo.GoodsResouceQO;
+
 import java.io.Serializable;
 
 public class UnionEnterpriseVO implements Serializable {
@@ -11,7 +13,7 @@ public class UnionEnterpriseVO implements Serializable {
     private Long fwhResourceId;
     private Long appletResourceId;
     private StoreResouceVO storeResouce;
-    private Long goodsResourceId;
+    private GoodsResouceVO goodsResouce;
     private Long orderResourceId;
     private Integer authCodeId;
     private Integer unionId;
@@ -80,14 +82,6 @@ public class UnionEnterpriseVO implements Serializable {
         this.appletResourceId = appletResourceId;
     }
 
-    public Long getGoodsResourceId() {
-        return goodsResourceId;
-    }
-
-    public void setGoodsResourceId(Long goodsResourceId) {
-        this.goodsResourceId = goodsResourceId;
-    }
-
     public Long getOrderResourceId() {
         return orderResourceId;
     }
@@ -103,4 +97,12 @@ public class UnionEnterpriseVO implements Serializable {
     public void setStoreResouce(StoreResouceVO storeResouce) {
         this.storeResouce = storeResouce;
     }
+
+    public GoodsResouceVO getGoodsResouce() {
+        return goodsResouce;
+    }
+
+    public void setGoodsResouce(GoodsResouceVO goodsResouce) {
+        this.goodsResouce = goodsResouce;
+    }
 }

gic-platform-auth-web/src/main/resources/dubbo-gic-platform-auth-web.xml

@@ -54,5 +54,5 @@
     <dubbo:reference interface="com.gic.auth.service.AuditorApiService" id="auditorApiService" timeout="6000" />
     <!--受审项目-->
     <dubbo:reference interface= "com.gic.enterprise.service.ProjectApiService" id="projectApiService" timeout="6000" />
-
+    <dubbo:reference interface="com.gic.goods.api.service.GoodsRightsSelectorApiService" id="goodsRightsSelectorApiService" timeout="60000" retries="0" />
 </beans>
\ No newline at end of file