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

gic-data-cloud-service/src/main/java/com/gic/cloud/service/outer/impl/FunctionApiServiceImpl.java

@@ -156,12 +156,12 @@ public class FunctionApiServiceImpl implements FunctionApiService{
         }
         //一个流只能用一次
         Stream<String> stream = Arrays.stream(functionComponent.split(","));
-        Stream<String> stream1 = Arrays.stream(functionComponent.split(","));
+        Stream<String> streamTwo = Arrays.stream(functionComponent.split(","));
         if (stream.anyMatch(e -> !FunctionEnum.isRightCode(e))) {
             return ServiceResponse.failure(ErrorCode.PARAMETER_ERROR.getCode(), "功能组件值非法");
         }
         StringBuilder temp = new StringBuilder("_");
-        stream1.sorted().forEach(e -> {
+        streamTwo.sorted().forEach(e -> {
             temp.append(e).append("_");
         });
         dto.setFunctionComponent(temp.toString());

gic-data-cloud-service/src/main/java/com/gic/cloud/service/outer/impl/IndexDescApiServiceImpl.java

@@ -118,13 +118,13 @@ public class IndexDescApiServiceImpl implements IndexDescApiService {
         List<TabIndexDesc> indexDescList = this.indexDescService.listAllUnRel(notInIndexDescIdList);
 
         if (StringUtils.isNotBlank(moduleIds)) {
-            List<Integer> relModuleIdList2 = Stream.of(moduleIds.split(",")).map(Integer::valueOf).collect(Collectors.toList());
-            List<TabIndexDesc> indexDescList2 = this.indexDescService.listByIds(relModuleIdList2);
-            if (CollectionUtils.isNotEmpty(indexDescList2)) {
+            List<Integer> relModuleIdListTwo = Stream.of(moduleIds.split(",")).map(Integer::valueOf).collect(Collectors.toList());
+            List<TabIndexDesc> indexDescListTwo = this.indexDescService.listByIds(relModuleIdListTwo);
+            if (CollectionUtils.isNotEmpty(indexDescListTwo)) {
                 if (CollectionUtils.isEmpty(indexDescList)) {
                     indexDescList = new ArrayList<>();
                 }
-                indexDescList.addAll(indexDescList2);
+                indexDescList.addAll(indexDescListTwo);
             }
         }
 

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

@@ -85,14 +85,14 @@ public class ConsumeStructureController {
         vo.setPage(this.goDownComponent.parseData(pageServiceResponse.getResult(), params.getChannel(), params.getEnterpriseId(), params.getLevel(), maxLevel));
         params.setCountType(2);
         goDownComponent.setValueTotalForArea(params, levelVo);
-        ServiceResponse<Page<AgeConsumeAreaDTO>> response1 = consumeStructureApiService.pageAgeConsumeArea(params);
-        this.goDownComponent.parseTotal(response1, vo);
+        ServiceResponse<Page<AgeConsumeAreaDTO>> ageConsumeAreaResponse = consumeStructureApiService.pageAgeConsumeArea(params);
+        this.goDownComponent.parseTotal(ageConsumeAreaResponse, vo);
         if(params.getChannel() != null && params.getChannel() == 1 && params.getLevel().intValue() == levelVo.getLevel()){
             //无归属
             params.setCountType(3);
             goDownComponent.setValueWgsForArea(params, levelVo);
-            ServiceResponse<Page<AgeConsumeAreaDTO>> response2 = consumeStructureApiService.pageAgeConsumeArea(params);
-            this.goDownComponent.parseWgs(response2, vo);
+            ServiceResponse<Page<AgeConsumeAreaDTO>> wgsResponse = consumeStructureApiService.pageAgeConsumeArea(params);
+            this.goDownComponent.parseWgs(wgsResponse, vo);
         }
         return RestResponse.success(vo);
     }
@@ -131,14 +131,14 @@ public class ConsumeStructureController {
         vo.setPage(this.goDownComponent.parseData(pageServiceResponse.getResult(), params.getChannel(), params.getEnterpriseId(), params.getLevel(), maxLevel));
         params.setCountType(2);
         goDownComponent.setValueTotalForArea(params, levelVo);
-        ServiceResponse<Page<GradeConsumeAreaDTO>> response1 = consumeStructureApiService.pageGradeConsumeArea(params);
-        this.goDownComponent.parseTotal(response1, vo);
+        ServiceResponse<Page<GradeConsumeAreaDTO>> gradeConsumeAreaResponse = consumeStructureApiService.pageGradeConsumeArea(params);
+        this.goDownComponent.parseTotal(gradeConsumeAreaResponse, vo);
         if(params.getChannel() != null && params.getChannel() == 1 && params.getLevel().intValue() == levelVo.getLevel()){
             params.setCountType(3);
             //无归属
             goDownComponent.setValueWgsForArea(params, levelVo);
-            ServiceResponse<Page<GradeConsumeAreaDTO>> response2 = consumeStructureApiService.pageGradeConsumeArea(params);
-            this.goDownComponent.parseWgs(response2, vo);
+            ServiceResponse<Page<GradeConsumeAreaDTO>> wgsResponse = consumeStructureApiService.pageGradeConsumeArea(params);
+            this.goDownComponent.parseWgs(wgsResponse, vo);
         }
         return RestResponse.success(vo);
     }
@@ -195,14 +195,14 @@ public class ConsumeStructureController {
         vo.setPage(this.goDownComponent.parseData(pageServiceResponse.getResult(), params.getChannel(), params.getEnterpriseId(), params.getLevel(), maxLevel));
         params.setCountType(2);
         goDownComponent.setValueTotalForArea(params, levelVo);
-        ServiceResponse<Page<BirthConsumeAreaDTO>> response1 = consumeStructureApiService.pageBirthConsumeArea(params);
-        this.goDownComponent.parseTotal(response1, vo);
+        ServiceResponse<Page<BirthConsumeAreaDTO>> birthConsumeAreaResponse = consumeStructureApiService.pageBirthConsumeArea(params);
+        this.goDownComponent.parseTotal(birthConsumeAreaResponse, vo);
         if(params.getChannel() != null && params.getChannel() == 1 && params.getLevel().intValue() == levelVo.getLevel()){
             params.setCountType(3);
             //无归属
             goDownComponent.setValueWgsForArea(params, levelVo);
-            ServiceResponse<Page<BirthConsumeAreaDTO>> response2 = consumeStructureApiService.pageBirthConsumeArea(params);
-            this.goDownComponent.parseWgs(response2, vo);
+            ServiceResponse<Page<BirthConsumeAreaDTO>> wgsResponse = consumeStructureApiService.pageBirthConsumeArea(params);
+            this.goDownComponent.parseWgs(wgsResponse, vo);
         }
         return RestResponse.success(vo);
     }
@@ -251,14 +251,14 @@ public class ConsumeStructureController {
         vo.setPage(this.goDownComponent.parseData(pageServiceResponse.getResult(), params.getChannel(), params.getEnterpriseId(), params.getLevel(), maxLevel));
         params.setCountType(2);
         goDownComponent.setValueTotalForArea(params, levelVo);
-        ServiceResponse<Page<NewOldConsumeAreaDTO>> response1 = consumeStructureApiService.pageNewOldConsumeArea(params);
-        this.goDownComponent.parseTotal(response1, vo);
+        ServiceResponse<Page<NewOldConsumeAreaDTO>> newOldConsumeAreaResponse = consumeStructureApiService.pageNewOldConsumeArea(params);
+        this.goDownComponent.parseTotal(newOldConsumeAreaResponse, vo);
         if(params.getChannel() != null && params.getChannel() == 1 && params.getLevel().intValue() == levelVo.getLevel()){
             params.setCountType(3);
             //无归属
             goDownComponent.setValueWgsForArea(params, levelVo);
-            ServiceResponse<Page<NewOldConsumeAreaDTO>> response2 = consumeStructureApiService.pageNewOldConsumeArea(params);
-            this.goDownComponent.parseWgs(response2, vo);
+            ServiceResponse<Page<NewOldConsumeAreaDTO>> wgsResponse = consumeStructureApiService.pageNewOldConsumeArea(params);
+            this.goDownComponent.parseWgs(wgsResponse, vo);
         }
         return RestResponse.success(vo);
     }
@@ -307,14 +307,14 @@ public class ConsumeStructureController {
         vo.setPage(this.goDownComponent.parseData(pageServiceResponse.getResult(), params.getChannel(), params.getEnterpriseId(), params.getLevel(), maxLevel));
         params.setCountType(2);
         goDownComponent.setValueTotalForArea(params, levelVo);
-        ServiceResponse<Page<WhetherConsumeAreaDTO>> response1 = consumeStructureApiService.pageWhetherConsumeArea(params);
-        this.goDownComponent.parseTotal(response1, vo);
+        ServiceResponse<Page<WhetherConsumeAreaDTO>> whetherConsumeAreaResponse = consumeStructureApiService.pageWhetherConsumeArea(params);
+        this.goDownComponent.parseTotal(whetherConsumeAreaResponse, vo);
         if(params.getChannel() != null && params.getChannel() == 1 && params.getLevel().intValue() == levelVo.getLevel()){
             //无归属
             params.setCountType(3);
             goDownComponent.setValueWgsForArea(params, levelVo);
-            ServiceResponse<Page<WhetherConsumeAreaDTO>> response2 = consumeStructureApiService.pageWhetherConsumeArea(params);
-            this.goDownComponent.parseWgs(response2, vo);
+            ServiceResponse<Page<WhetherConsumeAreaDTO>> wgsResponse = consumeStructureApiService.pageWhetherConsumeArea(params);
+            this.goDownComponent.parseWgs(wgsResponse, vo);
         }
         return RestResponse.success(vo);
     }

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

@@ -232,12 +232,12 @@ public class GoDownComponent {
                 gicMall(page, channel, enterpriseId, level);
             }
             if(StoreChannelEnum.WMMALL.getChannel().equals(channel)){
-                List<WmStoreDTO> result1 = wmStoreApiService.listWmStore(enterpriseId, null).getResult();
-                if(CollectionUtils.isNotEmpty(result1)){
+                List<WmStoreDTO> wmStoreList = wmStoreApiService.listWmStore(enterpriseId, null).getResult();
+                if(CollectionUtils.isNotEmpty(wmStoreList)){
                     page.getResult().stream().forEach(b -> {
                         BaseDTO baseSalesDTO = (BaseDTO) b;
                         baseSalesDTO.setLevel(level - 1);
-                        for(WmStoreDTO dto : result1){
+                        for(WmStoreDTO dto : wmStoreList){
                             if(baseSalesDTO instanceof BaseSalesDTO){
                                 if(baseSalesDTO.getId().equals(dto.getWmMallStoreId()+"")){
                                     baseSalesDTO.setName(dto.getWmMainAccount());

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

@@ -98,10 +98,10 @@ public class IndexController {
             onLine.add("-1");
         }
         List<Long> mbrAreaIdList = this.dataAuthUtils.getMbrAreaId(userId, enterpriseId);
-        ServiceResponse<IndexMemberOrderCntDTO> response1 = this.indexSalesApiService.getIndexMemberOrderCnt(enterpriseId, list, onLine,
+        ServiceResponse<IndexMemberOrderCntDTO> allMemberOrderCntResponse = this.indexSalesApiService.getIndexMemberOrderCnt(enterpriseId, list, onLine,
                 StringUtils.isNoneBlank(mbrAreaId) ? Long.valueOf(mbrAreaId) : null,
                 mbrAreaIdList, dateTypeQo.getType(), dateTypeQo.getDate(), 1);
-        ServiceResponse<IndexMemberOrderCntDTO> response2 = this.indexSalesApiService.getIndexMemberOrderCnt(enterpriseId, list, onLine,
+        ServiceResponse<IndexMemberOrderCntDTO> memberOrderCntResponse = this.indexSalesApiService.getIndexMemberOrderCnt(enterpriseId, list, onLine,
                 StringUtils.isNoneBlank(mbrAreaId) ? Long.valueOf(mbrAreaId) : null,
                 mbrAreaIdList, dateTypeQo.getType(), dateTypeQo.getDate(), 2);
         ServiceResponse<IndexMemberOldOrderCnt> oldOrderCnt = this.indexSalesApiService.getIndexMemberOldOrderCnt(enterpriseId, list, onLine,
@@ -110,17 +110,17 @@ public class IndexController {
         ServiceResponse<IndexMemberBirthCntDTO> birthOrderCnt = this.indexSalesApiService.getIndexMemberBirthOrderCnt(enterpriseId, list, onLine,
                 StringUtils.isNoneBlank(mbrAreaId) ? Long.valueOf(mbrAreaId) : null,
                 mbrAreaIdList, dateTypeQo.getType(), dateTypeQo.getDate());
-        log.info("response1:{}", JSON.toJSONString(response1));
-        log.info("response2:{}", JSON.toJSONString(response2));
+        log.info("allMemberOrderCntResponse:{}", JSON.toJSONString(allMemberOrderCntResponse));
+        log.info("memberOrderCntResponse:{}", JSON.toJSONString(memberOrderCntResponse));
         log.info("oldOrderCnt:{}", JSON.toJSONString(oldOrderCnt));
         log.info("birthOrderCnt:{}", JSON.toJSONString(birthOrderCnt));
         IndexConsume consume = new IndexConsume();
-        if(response1.isSuccess() && response1.getResult() != null && response2.getResult() != null){
-            IndexMemberOrderCntDTO indexMemberOrderCntDto1 = response1.getResult();
-            IndexMemberOrderCntDTO indexMemberOrderCntDto2 = response2.getResult();
-            consume.setMemberRate(DataFormatUtils.rate(indexMemberOrderCntDto2.getOrderCnt(), indexMemberOrderCntDto1.getOrderCnt()));
-            String divide = DataFormatUtils.divide(DataFormatUtils.divideDouble(indexMemberOrderCntDto2.getOrderCnt(), indexMemberOrderCntDto1.getOrderCntHb()),
-                    DataFormatUtils.divideDouble(indexMemberOrderCntDto2.getOrderCnt(), indexMemberOrderCntDto1.getOrderCntHb()));
+        if(allMemberOrderCntResponse.isSuccess() && allMemberOrderCntResponse.getResult() != null && memberOrderCntResponse.getResult() != null){
+            IndexMemberOrderCntDTO allMemberOrderCntDto = allMemberOrderCntResponse.getResult();
+            IndexMemberOrderCntDTO memberOrderCntDto = memberOrderCntResponse.getResult();
+            consume.setMemberRate(DataFormatUtils.rate(memberOrderCntDto.getOrderCnt(), allMemberOrderCntDto.getOrderCnt()));
+            String divide = DataFormatUtils.divide(DataFormatUtils.divideDouble(memberOrderCntDto.getOrderCnt(), allMemberOrderCntDto.getOrderCntHb()),
+                    DataFormatUtils.divideDouble(memberOrderCntDto.getOrderCnt(), allMemberOrderCntDto.getOrderCntHb()));
             consume.setMemberHb(divide);
         }
         if(oldOrderCnt.isSuccess() && oldOrderCnt.getResult() != null){

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

@@ -86,14 +86,14 @@ public class MemberCloudDataController {
         vo.setPage(this.goDownComponent.parseData(pageServiceResponse.getResult(), params.getChannel(), params.getEnterpriseId(), params.getLevel(), maxLevel));
         params.setCountType(2);
         goDownComponent.setValueTotalForArea(params, levelVo);
-        ServiceResponse<Page<MemberDistributionAreaDTO>> response1 = memberCloudDataApiService.pageMemberDistributionArea(params);
-        this.goDownComponent.parseTotal(response1, vo);
+        ServiceResponse<Page<MemberDistributionAreaDTO>> memberDistributionAreaResponse = memberCloudDataApiService.pageMemberDistributionArea(params);
+        this.goDownComponent.parseTotal(memberDistributionAreaResponse, vo);
         if(params.getChannel() != null && params.getChannel() == 1 && params.getLevel() == levelVo.getLevel().intValue()){
             //无归属
             params.setCountType(3);
             goDownComponent.setValueWgsForArea(params, levelVo);
-            ServiceResponse<Page<MemberDistributionAreaDTO>> response2 = memberCloudDataApiService.pageMemberDistributionArea(params);
-            this.goDownComponent.parseWgs(response2, vo);
+            ServiceResponse<Page<MemberDistributionAreaDTO>> wgsResponse = memberCloudDataApiService.pageMemberDistributionArea(params);
+            this.goDownComponent.parseWgs(wgsResponse, vo);
         }
         return RestResponse.success(vo);
     }
@@ -116,14 +116,14 @@ public class MemberCloudDataController {
         vo.setPage(this.goDownComponent.parseData(pageServiceResponse.getResult(), params.getChannel(), params.getEnterpriseId(), params.getLevel(), maxLevel));
         params.setCountType(2);
         goDownComponent.setValueTotalForArea(params, levelVo);
-        ServiceResponse<Page<MemberRecruitAreaDTO>> response1 = memberCloudDataApiService.pageMemberRecruitArea(params);
-        this.goDownComponent.parseTotal(response1, vo);
+        ServiceResponse<Page<MemberRecruitAreaDTO>> memberRecruitAreaResponse = memberCloudDataApiService.pageMemberRecruitArea(params);
+        this.goDownComponent.parseTotal(memberRecruitAreaResponse, vo);
         if(params.getChannel() != null && params.getChannel() == 1 && params.getLevel() == levelVo.getLevel().intValue()){
             //无归属
             params.setCountType(3);
             goDownComponent.setValueWgsForArea(params, levelVo);
-            ServiceResponse<Page<MemberRecruitAreaDTO>> response2 = memberCloudDataApiService.pageMemberRecruitArea(params);
-            this.goDownComponent.parseWgs(response2, vo);
+            ServiceResponse<Page<MemberRecruitAreaDTO>> wgsResponse = memberCloudDataApiService.pageMemberRecruitArea(params);
+            this.goDownComponent.parseWgs(wgsResponse, vo);
         }
         return RestResponse.success(vo);
     }

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

@@ -266,10 +266,10 @@ public class StoreWidgetController {
             storeTypeVo.setId("1");
             storeTypeVo.setName("启用");
             list.add(storeTypeVo);
-            StoreTypeVo storeTypeVo1 = new StoreTypeVo();
-            storeTypeVo1.setId("2");
-            storeTypeVo1.setName("不启用");
-            list.add(storeTypeVo1);
+            StoreTypeVo storeTypeVoNot = new StoreTypeVo();
+            storeTypeVoNot.setId("2");
+            storeTypeVoNot.setName("不启用");
+            list.add(storeTypeVoNot);
         }
         return RestResponse.success(list);
     }
@@ -373,9 +373,9 @@ public class StoreWidgetController {
                     }
                 }
                 if(StoreChannelEnum.WMMALL.getChannel().equals(onLineStore.getChannel())){
-                    List<WmStoreDTO> result1 = wmStoreApiService.listWmStore(enterpriseId, search).getResult();
-                    if(CollectionUtils.isNotEmpty(result1)){
-                        for(WmStoreDTO wmStoreDTO : result1){
+                    List<WmStoreDTO> wmStoreList = wmStoreApiService.listWmStore(enterpriseId, search).getResult();
+                    if(CollectionUtils.isNotEmpty(wmStoreList)){
+                        for(WmStoreDTO wmStoreDTO : wmStoreList){
                             if(onLineStore.getStoreIdList().contains(wmStoreDTO.getWmStoreId())){
                                 StoreSearchVo storeSearchVo = new StoreSearchVo();
                                 storeSearchVo.setId(wmStoreDTO.getWmStoreId());

gic-data-cloud-wxapp/src/main/java/com/gic/cloud/web/utils/BigDecimalConvertUtils.java

@@ -19,7 +19,7 @@ import java.math.BigDecimal;
 @Component
 public class BigDecimalConvertUtils {
     @Bean
-    public MappingJackson2HttpMessageConverter jackson2HttpMessageConverter1(){
+    public MappingJackson2HttpMessageConverter jackson2HttpMessageConverterBigDecimal(){
         MappingJackson2HttpMessageConverter jackson2HttpMessageConverter = new MappingJackson2HttpMessageConverter();
 
         ObjectMapper objectMapper = new ObjectMapper();

gic-data-cloud-wxapp/src/main/java/com/gic/cloud/web/utils/StringJsonSeralizer.java

@@ -26,7 +26,7 @@ public class StringJsonSeralizer extends JsonSerializer<String> {
         if(StringUtils.isNotBlank(value)){
             Matcher isNum = NUMBER_PATTERN.matcher(value);
             if(isNum.matches()){
-                BigDecimal decimal = new BigDecimal(value).setScale(1, BigDecimal.ROUND_HALF_UP);
+                BigDecimal decimal = new BigDecimal(value).setScale(2, BigDecimal.ROUND_HALF_UP);
                 jsonGenerator.writeString(decimal.toString());
                 return;
             }