门店控件修复

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/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();