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

gic-data-cloud-api/src/main/java/com/gic/cloud/dto/IndexDescDTO.java

@@ -65,7 +65,7 @@ public class IndexDescDTO implements Serializable {
     private Integer indexId;
 
     private String remark;
-    private Integer seq;
+    private Integer seq = 0;
 
     public Integer getIndexDescId() {
         return indexDescId;

gic-data-cloud-wxapp/src/main/java/com/gic/cloud/web/controller/IndexController.java

@@ -60,6 +60,11 @@ public class IndexController {
                                    DateTypeQo dateTypeQo, String mbrAreaId, Integer dataType){
         List<Integer> list = this.storeSearchUtils.storeSearch(userId, enterpriseId, searchJson);
         List<String> onLine = this.storeSearchUtils.onLineStoreSearch(userId, enterpriseId, searchJson);
+        boolean wgs = storeSearchUtils.isWgs(userId, enterpriseId, searchJson) == 1;
+        if(wgs){
+            list.add(-1);
+            onLine.add("-1");
+        }
         ServiceResponse<IndexSalesDTO> indexSales = this.indexSalesApiService.getIndexSales(enterpriseId, list, onLine,
                 StringUtils.isNoneBlank(mbrAreaId) ? Long.valueOf(mbrAreaId) : null, dateTypeQo.getType(), dateTypeQo.getDate(), dataType);
         return RestResponse.success(EntityUtil.changeEntityByJSON(IndexSalesVo.class, indexSales.getResult()));
@@ -70,6 +75,11 @@ public class IndexController {
                                    DateTypeQo dateTypeQo, String mbrAreaId){
         List<Integer> list = this.storeSearchUtils.storeSearch(userId, enterpriseId, searchJson);
         List<String> onLine = this.storeSearchUtils.onLineStoreSearch(userId, enterpriseId, searchJson);
+        boolean wgs = storeSearchUtils.isWgs(userId, enterpriseId, searchJson) == 1;
+        if(wgs){
+            list.add(-1);
+            onLine.add("-1");
+        }
         List<Long> mbrAreaIdList = this.dataAuthUtils.getMbrAreaId(userId, enterpriseId);
         ServiceResponse<IndexMemberDTO> indexMember = this.indexSalesApiService.getIndexMember(enterpriseId, list, onLine,
                 StringUtils.isNoneBlank(mbrAreaId) ? Long.valueOf(mbrAreaId) : null,
@@ -82,6 +92,11 @@ public class IndexController {
                                      DateTypeQo dateTypeQo, String mbrAreaId){
         List<Integer> list = this.storeSearchUtils.storeSearch(userId, enterpriseId, searchJson);
         List<String> onLine = this.storeSearchUtils.onLineStoreSearch(userId, enterpriseId, searchJson);
+        boolean wgs = storeSearchUtils.isWgs(userId, enterpriseId, searchJson) == 1;
+        if(wgs){
+            list.add(-1);
+            onLine.add("-1");
+        }
         List<Long> mbrAreaIdList = this.dataAuthUtils.getMbrAreaId(userId, enterpriseId);
         ServiceResponse<IndexMemberOrderCntDTO> response1 = this.indexSalesApiService.getIndexMemberOrderCnt(enterpriseId, list, onLine,
                 StringUtils.isNoneBlank(mbrAreaId) ? Long.valueOf(mbrAreaId) : null,

gic-data-cloud-wxapp/src/main/java/com/gic/cloud/web/controller/StoreSearchUtils.java

@@ -92,9 +92,10 @@ public class StoreSearchUtils {
         List<Integer> tempStoreIdList = new ArrayList<>();
         if(tempStoreConditionDTO != null) {
             Integer tempStoreId = tempStoreConditionDTO.getStoreWidgetId();
-            tempStoreIdList = this.storeWidgetApiService.listStoreInfoIdByStoreWidgetId(enterpriseId, tempStoreId).getResult();
+            tempStoreIdList = this.storeWidgetApiService.listStoreIdByStoreWidgetId(enterpriseId, tempStoreId).getResult();
         }
         final List<Integer> tempStoreIdListf = tempStoreIdList;
+        log.info("tempStoreIdList:{}", JSON.toJSONString(tempStoreIdListf));
         if(StringUtils.isNotBlank(searchJson)){
             JSONObject json = JSON.parseObject(searchJson);
             StoreSearchQo storeSearchQo = json.getObject(StoreChannelEnum.OFFLINE.getChannel().toString(), StoreSearchQo.class);