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

haoban-manage3-api/src/main/java/com/gic/haoban/manage/api/service/WxEnterpriseRelatedApiService.java

@@ -170,4 +170,6 @@ public interface WxEnterpriseRelatedApiService {
 	
 	public int getRelationCount(String enterpriseId) ;
 
+	public com.gic.api.base.commons.ServiceResponse<Integer> getEnterprieseQwType(String enterpriseId) ;
+
 }

haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/service/content/adaptor/MaterialDataAdaptor.java

@@ -91,7 +91,11 @@ public class MaterialDataAdaptor {
         if (result.get("data") == null) {
             return null;
         }
-        JSONObject jsonObject = DataApiUtils.getPageOne(result);
+        List<JSONObject> dataList = DataApiUtils.getDataList(result);
+        if (CollectionUtils.isEmpty(dataList)) {
+            return null;
+        }
+        JSONObject jsonObject = dataList.get(0);
         if (jsonObject.isEmpty()) {
             return null;
         }
@@ -136,7 +140,11 @@ public class MaterialDataAdaptor {
         if (result.get("data") == null) {
             return null;
         }
-        JSONObject jsonObject = DataApiUtils.getPageOne(result);
+        List<JSONObject> dataList = DataApiUtils.getDataList(result);
+        if (CollectionUtils.isEmpty(dataList)) {
+            return null;
+        }
+        JSONObject jsonObject = dataList.get(0);
         if (jsonObject.isEmpty()) {
             return null;
         }

haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/service/impl/StaffClerkRelationServiceImpl.java

@@ -136,6 +136,7 @@ public class StaffClerkRelationServiceImpl implements StaffClerkRelationService
             List<StaffClerkRelationDTO> relationList = this.listByStaffId(wxEnterpriseId, staffId) ;
             Set<String> set = relationList.stream().map(o->o.getEnterpriseId()).collect(Collectors.toSet()) ;
             // 否关联的多个商户
+            logger.info("关联商户={}",set.size());
             boolean multipleFlag = set.size() > 1 ;
             List<String> storeIdList = relationList.stream().filter(o->!storeId.equals(o.getStoreId()) && o.getEnterpriseId().equals(enterpriseId)).map(o->o.getStoreId()).collect(Collectors.toList()) ;
             logger.info("成员{},关联门店数={},同商户下的门店={}",staffId,relationList.size(),JSON.toJSON(storeIdList));
@@ -173,6 +174,10 @@ public class StaffClerkRelationServiceImpl implements StaffClerkRelationService
                     newClerkId = mainClerk.getClerkId() ;
                     logger.info("查询到成员的主门店导购={},{}",staffId,newClerkId);
                 }
+            }else {
+                if(multipleFlag) {
+                    needFlush = true ;
+                }
             }
         }
         // 删除关联关系

haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/service/out/impl/WxEnterpriseRelatedApiServiceImpl.java

@@ -730,4 +730,9 @@ public class WxEnterpriseRelatedApiServiceImpl implements WxEnterpriseRelatedApi
     public int getRelationCount(String enterpriseId) {
         return this.wxEnterpriseRelatedService.getRelationCount(enterpriseId);
     }
+
+    @Override
+    public com.gic.api.base.commons.ServiceResponse<Integer> getEnterprieseQwType(String enterpriseId) {
+        return this.wxEnterpriseRelatedService.getEnterprieseQwType(enterpriseId);
+    }
 }

haoban-manage3-wx/src/main/java/com/gic/haoban/manage/web/controller/content/ContentThirdController.java

+package com.gic.haoban.manage.web.controller.content;
+
+import com.gic.api.base.commons.ServiceResponse;
+import com.gic.commons.util.EntityUtil;
+import com.gic.commons.webapi.reponse.RestResponse;
+import com.gic.content.api.dto.aigc.AIGCContent;
+import com.gic.content.api.qdto.aigc.ContentAIGCQDTO;
+import com.gic.content.api.service.common.ThirdApiService;
+import com.gic.haoban.manage.web.qo.content.ContentAIGCQO;
+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.ResponseBody;
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * 好办-三方接口
+ */
+@RestController()
+public class ContentThirdController {
+
+    private static final Logger log = LoggerFactory.getLogger(ContentThirdController.class);
+
+    @Autowired
+    private ThirdApiService thirdApiService;
+
+    /**
+     * AIGC生成文案
+     * @param aigcQO
+     * @return
+     */
+    @RequestMapping("/third/aigc")
+    @ResponseBody
+    public RestResponse<AIGCContent> aigc(@RequestBody ContentAIGCQO aigcQO) {
+        String clerkId = aigcQO.getClerkId();
+        ContentAIGCQDTO aigcQDTO = EntityUtil.changeEntityNew(ContentAIGCQDTO.class, aigcQO);
+        aigcQDTO.setUserId(clerkId);
+        ServiceResponse<AIGCContent> response = thirdApiService.aigc(aigcQDTO);
+        if (!response.isSuccess()) {
+            return RestResponse.failure(response.getCode(), response.getMessage());
+        }
+        return RestResponse.successResult(response.getResult());
+    }
+}

haoban-manage3-wx/src/main/java/com/gic/haoban/manage/web/qo/content/ContentAIGCQO.java

+package com.gic.haoban.manage.web.qo.content;
+
+/**
+ * Created by wangzubo on 2023/9/12.
+ */
+
+import java.io.Serializable;
+import java.util.List;
+
+public class ContentAIGCQO implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    private String enterpriseId;
+
+    private String clerkId;
+
+    /**
+     * 商品id列表
+     */
+    private List<String> goodsIdList;
+
+    /**
+     * 营销节点
+     */
+    private String holiday;
+
+    /**
+     * 营销主题
+     */
+    private String theme;
+
+    /**
+     * 营销折扣
+     */
+    private String discount;
+
+    /**
+     * 穿着场景
+     */
+    private String scene;
+
+    /**
+     * 自定义描述
+     */
+    private String customDescription;
+
+    /**
+     * 文案长度
+     */
+    private String length;
+
+    /**
+     * 文案类型
+     */
+    private String type;
+
+    /**
+     * 文案风格
+     */
+    private String style;
+
+    /**
+     * 标题风格
+     */
+    private String titleStyle;
+
+    /**
+     * title:标题content:内容 null为全部
+     */
+    private String contentType;
+
+    public String getEnterpriseId() {
+        return enterpriseId;
+    }
+
+    public void setEnterpriseId(String enterpriseId) {
+        this.enterpriseId = enterpriseId;
+    }
+
+    public String getClerkId() {
+        return clerkId;
+    }
+
+    public void setClerkId(String clerkId) {
+        this.clerkId = clerkId;
+    }
+
+    public List<String> getGoodsIdList() {
+        return goodsIdList;
+    }
+
+    public void setGoodsIdList(List<String> goodsIdList) {
+        this.goodsIdList = goodsIdList;
+    }
+
+    public String getHoliday() {
+        return holiday;
+    }
+
+    public void setHoliday(String holiday) {
+        this.holiday = holiday;
+    }
+
+    public String getTheme() {
+        return theme;
+    }
+
+    public void setTheme(String theme) {
+        this.theme = theme;
+    }
+
+    public String getDiscount() {
+        return discount;
+    }
+
+    public void setDiscount(String discount) {
+        this.discount = discount;
+    }
+
+    public String getScene() {
+        return scene;
+    }
+
+    public void setScene(String scene) {
+        this.scene = scene;
+    }
+
+    public String getCustomDescription() {
+        return customDescription;
+    }
+
+    public void setCustomDescription(String customDescription) {
+        this.customDescription = customDescription;
+    }
+
+    public String getLength() {
+        return length;
+    }
+
+    public void setLength(String length) {
+        this.length = length;
+    }
+
+    public String getType() {
+        return type;
+    }
+
+    public void setType(String type) {
+        this.type = type;
+    }
+
+    public String getStyle() {
+        return style;
+    }
+
+    public void setStyle(String style) {
+        this.style = style;
+    }
+
+    public String getTitleStyle() {
+        return titleStyle;
+    }
+
+    public void setTitleStyle(String titleStyle) {
+        this.titleStyle = titleStyle;
+    }
+
+    public String getContentType() {
+        return contentType;
+    }
+
+    public void setContentType(String contentType) {
+        this.contentType = contentType;
+    }
+}

haoban-manage3-wx/src/main/webapp/WEB-INF/dubbo-haoban-manage-wx.xml

@@ -121,6 +121,7 @@
     <dubbo:reference interface="com.gic.content.api.service.ContentColumnApiService" id="contentColumnApiService" timeout="10000" retries="0" check="false"/>
     <dubbo:reference interface="com.gic.content.api.service.ContentMaterialApiService" id="contentMaterialApiService" timeout="10000" retries="0" check="false"/>
     <dubbo:reference interface="com.gic.content.api.service.ContentMaterialShareApiService" id="contentMaterialShareApiService" timeout="10000" retries="0" check="false"/>
+    <dubbo:reference interface="com.gic.content.api.service.common.ThirdApiService" id="thirdApiService" timeout="10000" retries="0" check="false"/>
     <dubbo:reference id="settingApiService" interface="com.gic.haoban.app.aggregation.api.service.SettingApiService" timeout="10000" retries="0" check="false"/>
     <dubbo:reference id="newDataTargetConfigApiService" interface="com.gic.enterprise.api.service.target.NewDataTargetConfigApiService" timeout="100000" retries="0" check="false" />