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

liquidnet-bus-api/liquidnet-service-goblin-api/src/main/java/com/liquidnet/service/goblin/dto/manage/GoblinStoreMgtDigitalGoodsAddSkuParam.java

@@ -91,11 +91,11 @@ public class GoblinStoreMgtDigitalGoodsAddSkuParam implements Serializable {
     @Pattern(regexp = "\\b(0|1)\\b", message = "购买条件参数无效")
     private String buyFactor;
     @ApiModelProperty(position = 27, required = false, value = "是否隐藏[0-默认展示|1-隐藏]，`unbox=0`时必传", example = "0")
-//    @NotBlank(message = "是否隐藏不能为空")
+    @NotBlank(message = "是否隐藏不能为空")
     @Pattern(regexp = "\\b(0|1)\\b", message = "是否隐藏参数无效")
     private String skuAppear;
     @ApiModelProperty(position = 28, required = false, value = "是否购买[0-否|1-是]，`unbox=0`时必传", example = "1")
-//    @NotBlank(message = "是否购买不能为空")
+    @NotBlank(message = "是否购买不能为空")
     @Pattern(regexp = "\\b(0|1)\\b", message = "是否购买参数无效")
     private String skuCanbuy;
 //    @ApiModelProperty(position = 27, required = false, value = "购买限制人员名单URL，购买限制为2-指定用户时必填")
@@ -195,8 +195,8 @@ public class GoblinStoreMgtDigitalGoodsAddSkuParam implements Serializable {
             initVo.setSkuStock(0);
 //            initVo.setBuyLimit(this.getBuyLimit());//
 //            initVo.setBuyFactor(this.getBuyFactor());//
-            initVo.setSkuAppear("0");
-            initVo.setSkuCanbuy("1");
+            initVo.setSkuAppear(this.getSkuAppear());//1
+            initVo.setSkuCanbuy(this.getSkuCanbuy());//1
             initVo.setOpeningTime(DateUtil.Formatter.yyyyMMddHHmmss.parse(this.getOpeningTime()));//1
         }
         return initVo;
@@ -227,8 +227,8 @@ public class GoblinStoreMgtDigitalGoodsAddSkuParam implements Serializable {
             case "1":
 //                updateVo.setBuyLimit(this.getBuyLimit());//
 //                updateVo.setBuyFactor(this.getBuyFactor());//
-                updateVo.setSkuAppear("0");//
-                updateVo.setSkuCanbuy("1");//
+                updateVo.setSkuAppear(this.getSkuAppear());//1
+                updateVo.setSkuCanbuy(this.getSkuCanbuy());//1
                 updateVo.setName(this.getName());//1
                 updateVo.setSkuPic(this.getSkuPic());//1
                 updateVo.setSkuWatch(this.getSkuWatch());//1

liquidnet-bus-config/liquidnet-config/application-test.yml

@@ -73,11 +73,11 @@ liquidnet:
       host: r-2zeucai3yj2t0f4nmzpd.redis.rds.aliyuncs.com
       port: 6380
       password: 7eoK2XehKqF1
-    mongodb:
-      host: dds-2ze23697d93111041932-pub.mongodb.rds.aliyuncs.com:3717,dds-2ze23697d93111042720-pub.mongodb.rds.aliyuncs.com:3717
-      port: 3717
-      user: root
-      pwd: Sy6d*JwJ
+  mongodb:
+    host: dds-2ze23697d93111041932-pub.mongodb.rds.aliyuncs.com:3717,dds-2ze23697d93111042720-pub.mongodb.rds.aliyuncs.com:3717
+    port: 3717
+    user: root
+    pwd: Sy6d*JwJ
   service:
     adam:
       url-pay: