修改EditableTabs类

yudao-server/src/main/resources/application-local.yaml

@@ -244,7 +244,7 @@ dubbo:
 bxg:
   shop:
 #    API_URL: http://192.168.10.113:48080/bxgApp
-    API_URL:  https://5352-27-19-79-42.jp.ngrok.io
+    API_URL:  https://63eb-27-19-79-42.jp.ngrok.io
     SITE_URL: http://192.168.10.113:48080/bxgApp
     UNI_SITE_URL: http://192.168.10.113:48080/bxgApp
     ADMIN_API_URL: http://192.168.10.113:48080/bxg

zsw-bxg/src/main/java/co/yixiang/modules/activity/vo/YxStoreBargainQueryVo.java

@@ -11,6 +11,7 @@ import java.io.Serializable;
 import java.math.BigDecimal;
 import java.util.ArrayList;
 import java.util.Date;
+import java.util.List;
 
 /**
  * <p>
@@ -37,7 +38,7 @@ public class YxStoreBargainQueryVo implements Serializable {
     @ApiModelProperty(value = "砍价活动图片")
     private String image;
     //七天无理由等配置
-    private ArrayList<EditableTabs> config;
+    private List<EditableTabs> config;
 
     @ApiModelProperty(value = "单位名称")
     private String unitName;

zsw-bxg/src/main/java/co/yixiang/modules/activity/vo/YxStoreCombinationQueryVo.java

@@ -45,7 +45,7 @@ public class YxStoreCombinationQueryVo implements Serializable {
     private List<String> sliderImageArr;
 
     //七天无理由等配置
-    private ArrayList<EditableTabs> config;
+    private List<EditableTabs> config;
     public List<String> getSliderImageArr() {
         if(StrUtil.isNotEmpty(images)){
             return Arrays.asList(images.split(","));

zsw-bxg/src/main/java/co/yixiang/modules/activity/vo/YxStoreSeckillQueryVo.java

@@ -39,7 +39,7 @@ public class YxStoreSeckillQueryVo implements Serializable{
     private String image;
 
     //七天无理由价保等
-    private ArrayList<EditableTabs> config;
+    private List<EditableTabs> config;
     @ApiModelProperty(value = "轮播图")
     private String images;
 

zsw-bxg/src/main/java/co/yixiang/modules/evaluation/domain/EditableTabs.java

@@ -7,13 +7,9 @@ import java.io.Serializable;
 
 @Data
 public class EditableTabs implements Serializable {
+
     private static final long serialVersionUID = 1L;
 
-    //    {title: '初始栏',
-//    name: '0',
-//    content: '产品展示栏',
-//    configuration:'富文本框'
-//}
     private String title;
     private String name;
     private String content;

zsw-bxg/src/main/java/co/yixiang/modules/evaluation/domain/YxEvaluation.java

@@ -20,6 +20,7 @@ import javax.validation.constraints.*;
 import java.sql.Timestamp;
 import java.io.Serializable;
 import java.util.ArrayList;
+import java.util.List;
 
 /**
 * @author ssj
@@ -52,7 +53,7 @@ public class YxEvaluation implements Serializable {
 
     /** 图文配置*/
     @TableField(typeHandler = JacksonTypeHandler.class)
-    private ArrayList<EditableTabs> editableTabs;
+    private List<EditableTabs> editableTabs;
 
     /** 评测总结 */
     private String summary;

zsw-bxg/src/main/java/co/yixiang/modules/evaluation/service/dto/YxEvaluationDto.java

@@ -14,6 +14,7 @@ import lombok.Data;
 import java.sql.Timestamp;
 import java.io.Serializable;
 import java.util.ArrayList;
+import java.util.List;
 
 /**
 * @author hupeng
@@ -38,7 +39,7 @@ public class YxEvaluationDto implements Serializable {
     private String product;
 
     /** 图文配置*/
-    private ArrayList<EditableTabs> editableTabs;
+    private List<EditableTabs> editableTabs;
 
     /** 评测总结 */
     private String summary;

zsw-bxg/src/main/java/co/yixiang/modules/hotList/service/vo/YxStoreHotListVo.java

@@ -6,6 +6,7 @@ import lombok.Data;
 import java.io.Serializable;
 import java.sql.Timestamp;
 import java.util.ArrayList;
+import java.util.List;
 
 
 @Data
@@ -23,7 +24,7 @@ public class YxStoreHotListVo implements Serializable {
     private String productList;
 
     /**商品列表*/
-    private ArrayList<YxStoreProduct> productInfoList;
+    private List<YxStoreProduct> productInfoList;
 
     /** 榜单展示图片 */
     private String listImage;

zsw-bxg/src/main/java/co/yixiang/modules/order/rest/StoreOrderController.java

@@ -411,6 +411,9 @@ public class StoreOrderController {
                     criteria.setPaid(OrderInfoEnum.PAY_STATUS_1.getValue());
                     criteria.setRefundStatus(OrderInfoEnum.REFUND_STATUS_2.getValue());
                     break;
+                case "-9":
+                    criteria.setRefundStatus(OrderInfoEnum.REFUND_STATUS_0.getValue());
+                    break;
                 default:
             }
         }

zsw-bxg/src/main/java/co/yixiang/modules/product/domain/YxStoreProduct.java

@@ -31,6 +31,7 @@ import javax.validation.constraints.NotBlank;
 import javax.validation.constraints.NotNull;
 import java.math.BigDecimal;
 import java.util.ArrayList;
+import java.util.List;
 
 /**
 * @author hupeng
@@ -76,7 +77,7 @@ public class YxStoreProduct extends BaseDomain {
 
     /**价保和无理由退款等配置**/
     @TableField(typeHandler = JacksonTypeHandler.class)
-    private ArrayList<EditableTabs> config;
+    private List<EditableTabs> config;
 
     /** 商品简介 */
     @ApiModelProperty(value = "商品简介")
@@ -188,7 +189,7 @@ public class YxStoreProduct extends BaseDomain {
     /** 商品参数 */
     @ApiModelProperty(value = "商品参数")
     @TableField(typeHandler = JacksonTypeHandler.class)
-    private ArrayList<Parameter> parameter;
+    private List<Parameter> parameter;
 
     /** 是否包邮 */
     @ApiModelProperty(value = "是否包邮")

zsw-bxg/src/main/java/co/yixiang/modules/product/service/dto/ProductDto.java

@@ -44,7 +44,7 @@ public class ProductDto {
     private String storeInfo;
 
     /**价保和无理由退款等配置**/
-    private ArrayList<EditableTabs> config;
+    private List<EditableTabs> config;
 
     /** 关键字 */
     private String keyword;
@@ -90,7 +90,7 @@ public class ProductDto {
     private Integer isShow;
 
     /** 商品参数 */
-    private ArrayList<Parameter> parameter;
+    private List<Parameter> parameter;
 
     /** 是否热卖 */
     @JsonProperty("is_hot")

zsw-bxg/src/main/java/co/yixiang/modules/product/service/dto/StoreProductDto.java

@@ -57,7 +57,7 @@ public class StoreProductDto
 
     /**价保和无理由退款等配置**/
     @JsonProperty("config")
-    private ArrayList<EditableTabs> config;
+    private List<EditableTabs> config;
 
     /** 商品条码（一维码） */
     @JsonProperty("bar_code")
@@ -119,7 +119,7 @@ public class StoreProductDto
     private String description;
 
     /** 商品参数 */
-    private ArrayList<Parameter> parameter;
+    private List<Parameter> parameter;
 
     /** 是否包邮 */
     @JsonProperty("is_postage")

zsw-bxg/src/main/java/co/yixiang/modules/product/vo/YxStoreProductQueryVo.java

@@ -49,7 +49,7 @@ public class YxStoreProductQueryVo implements Serializable {
     private String codeBase;
 
     /**价保和无理由退款等配置**/
-    private ArrayList<EditableTabs> config;
+    private List<EditableTabs> config;
 
     public String getImage_base() {
         return image;
@@ -129,7 +129,7 @@ public class YxStoreProductQueryVo implements Serializable {
     private String description;
 
     @ApiModelProperty(value = "商品参数")
-    private ArrayList<Parameter> parameter;
+    private List<Parameter> parameter;
 
     @ApiModelProperty(value = "是否包邮")
     private Integer isPostage;

zsw-bxg/src/main/java/co/yixiang/utils/EvaluationDTO.java

@@ -39,7 +39,7 @@ public class EvaluationDTO implements Serializable {
     private String homeImage;
 
     /**图文配置**/
-    private ArrayList<EditableTabs> editableTabs;
+    private List<EditableTabs> editableTabs;
 
 
     /** 评测介绍 */

zsw-bxg/src/main/java/co/yixiang/utils/HotListDTO.java

@@ -25,7 +25,7 @@ public class HotListDTO implements Serializable {
     private String listName;
 
     //当月所有的商品分类
-    private ArrayList<CateDto> cateDtos;
+    private List<CateDto> cateDtos;
 
 //    /**商品信息数组**/
     private List<YxStoreProduct> productInfo;

zsw-bxg/src/main/java/co/yixiang/utils/WxTemplate/TemplateCard.java

@@ -6,6 +6,8 @@ import lombok.Builder;
 import lombok.Data;
 
 import java.util.ArrayList;
+import java.util.List;
+
 @Data
 @Builder
 public class TemplateCard {
@@ -43,7 +45,7 @@ public class TemplateCard {
      keyname:二级标题、value:内容、url：链接
      * */
     @JSONField(name = "horizontal_content_list")
-    private ArrayList<HorizontalContent> horizontalContentList;
+    private List<HorizontalContent> horizontalContentList;
 
     /** {
      "type":1,
@@ -57,7 +59,7 @@ public class TemplateCard {
      "title":"跳转小程序"
      }*/
     @JSONField(name = "jump_list")
-    private ArrayList<Jump> jumpList;
+    private List<Jump> jumpList;
 
     /** 0 = 未购买 1 = 已购买 "type":1,
      "url":"https://work.weixin.qq.com/?from=openApi",

zsw-bxg/src/main/java/co/yixiang/utils/hotListDto/HotListDataDto.java

@@ -5,11 +5,12 @@ import lombok.Data;
 
 import java.io.Serializable;
 import java.util.ArrayList;
+import java.util.List;
 
 @Data
 public class HotListDataDto implements Serializable {
 
     //当月的榜单信息
-    private ArrayList<HotListDTO> hotListDTOS;
+    private List<HotListDTO> hotListDTOS;
 
 }