Merge remote-tracking branch 'origin/dev_goblin' into pre

liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-web/src/main/resources/templates/zhengzai/store/homeSet/RubikArea.html

@@ -122,7 +122,7 @@
                 </div>
                 <div class="tags">
                     <label>
-                        <input type="radio" value="1" id="optionsRadios1" name="optionsRadios"><span>一行一个</span></label>
+                        <input type="radio" checked value="1" id="optionsRadios1" name="optionsRadios"><span>一行一个</span></label>
                     <!-- <label>
                         <input type="radio" value="2" id="optionsRadios2" name="optionsRadios"><span>一行两个</span></label>
                     <label>
@@ -255,6 +255,8 @@
                         $("#bannerList").append(str);
                         common(i)
                     }
+                } else {
+                    addItem(1)
                 }
                 // refreshItem()
             })

liquidnet-bus-service/liquidnet-service-goblin/liquidnet-service-goblin-impl/docu/db_ln_goblin_initialdata.sql

@@ -809,19 +809,7 @@ create table goblin_back_order
     refuse_size int default 0 comment '拒绝次数',
     refuse_reason varchar(255) default '' comment '退款原因',
     error_reason varchar(255) default '' comment '退款失败原因',
-
-    private String errorReason;
-
-    private LocalDateTime auditAt;
-
-    private LocalDateTime expireAt;
-
-    private LocalDateTime refundAt;
-
-    private LocalDateTime refuseAt;
-
-    private int refusedSize;
-
+    expire_at          datetime,
     created_at         datetime,
     updated_at         datetime,
     comment            text,

liquidnet-bus-service/liquidnet-service-goblin/liquidnet-service-goblin-impl/src/main/java/com/liquidnet/service/goblin/util/GoblinMongoUtils.java

@@ -321,9 +321,9 @@ public class GoblinMongoUtils {
         ).getModifiedCount() > 0;
     }
 
-    public boolean delGoodsSkuInfoVo(String spuId) {
+    public boolean delGoodsSkuInfoVo(String skuId) {
         return mongoTemplate.getCollection(GoblinGoodsSkuInfoVo.class.getSimpleName()).updateOne(
-                Query.query(Criteria.where("skuId").is(spuId).and("delFlg").is("0")).getQueryObject(),
+                Query.query(Criteria.where("skuId").is(skuId).and("delFlg").is("0")).getQueryObject(),
                 Update.update("delFlg", "1").getUpdateObject()
         ).getModifiedCount() > 0;
     }
@@ -500,7 +500,7 @@ public class GoblinMongoUtils {
 
     // SPU信息
     public boolean updateGoodsInfoVoAppear(String storeId, String spuAppear, LocalDateTime time, String uid) {
-        return mongoTemplate.getCollection(GoblinGoodsInfoVo.class.getSimpleName()).updateOne(
+        return mongoTemplate.getCollection(GoblinGoodsInfoVo.class.getSimpleName()).updateMany(
                 Query.query(Criteria.where("storeId").is(storeId).and("delFlg").is("0")).getQueryObject(),
                 Update.update("spuAppear", spuAppear).set("updatedBy", uid).set("updatedAt", time).getUpdateObject()
         ).getModifiedCount() > 0;