Merge remote-tracking branch 'refs/remotes/origin/master' into test-ecs

liquidnet-bus-api/liquidnet-service-goblin-api/src/main/java/com/liquidnet/service/goblin/constant/GoblinGoodsShowInMallHelper.java

+package com.liquidnet.service.goblin.constant;
+
+import com.liquidnet.service.goblin.dto.vo.GoblinGoodsInfoVo;
+
+/**
+ * 商品「是否展示到商城」取值约定：0-否，1-是。
+ * 落库 / 写 SQL 参数时统一通过 {@link #resolve(GoblinGoodsInfoVo)}，避免各处 magic number。
+ */
+public final class GoblinGoodsShowInMallHelper {
+
+    public static final int SHOW_IN_MALL_YES = 1;
+    public static final int SHOW_IN_MALL_NO = 0;
+
+    /** 收钱吧演出关联商品，与前台 {@code spuType=33} 约定一致 */
+    public static final int SQB_SPU_TYPE = 33;
+
+    private GoblinGoodsShowInMallHelper() {
+    }
+
+    /**
+     * 解析落库用的 show_in_mall：VO 已赋值则沿用；未赋值时普通商品默认展示，SQB 商品默认不展示。
+     */
+    public static int resolve(GoblinGoodsInfoVo vo) {
+        if (vo == null) {
+            return SHOW_IN_MALL_YES;
+        }
+        if (vo.getShowInMall() != null) {
+            return vo.getShowInMall();
+        }
+        return vo.getSpuType() == SQB_SPU_TYPE ? SHOW_IN_MALL_NO : SHOW_IN_MALL_YES;
+    }
+
+    /** 请求参数未传时的默认值（普通商品 add/edit） */
+    public static int defaultFromRequest(Integer showInMall) {
+        return showInMall == null ? SHOW_IN_MALL_YES : showInMall;
+    }
+}

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

@@ -6,6 +6,7 @@ import com.liquidnet.commons.lang.util.CollectionUtil;
 import com.liquidnet.commons.lang.util.DateUtil;
 import com.liquidnet.commons.lang.util.IDGenerator;
 import com.liquidnet.service.base.ErrorMapping;
+import com.liquidnet.service.goblin.constant.GoblinGoodsShowInMallHelper;
 import com.liquidnet.service.goblin.dto.GoblinGoodsSpecDto;
 import com.liquidnet.service.goblin.dto.vo.GoblinGoodsInfoVo;
 import com.liquidnet.service.goblin.dto.vo.GoblinGoodsSkuInfoVo;
@@ -18,6 +19,8 @@ import org.apache.commons.lang3.StringUtils;
 import org.springframework.util.CollectionUtils;
 
 import javax.validation.Valid;
+import javax.validation.constraints.Max;
+import javax.validation.constraints.Min;
 import javax.validation.constraints.NotBlank;
 import javax.validation.constraints.NotNull;
 import javax.validation.constraints.Pattern;
@@ -128,6 +131,10 @@ public class GoblinStoreMgtGoodsAddParam implements Serializable {
     @ApiModelProperty(position = 31, required = true, value = "是否虚拟商品[0-否|1-是]", allowableValues = "0,1", example = "0")
     @Pattern(regexp = "\\b(0|1)\\b", message = "是否虚拟商品参数无效")
     private String virtualFlg;
+    @ApiModelProperty(position = 31, required = false, value = "是否展示到商城[0-否|1-是]", allowableValues = "0,1", example = "1")
+    @Min(value = 0, message = "是否展示到商城参数无效")
+    @Max(value = 1, message = "是否展示到商城参数无效")
+    private Integer showInMall;
 
     /**
      * ---------------------------- 服务保障 ----------------------------
@@ -191,6 +198,7 @@ public class GoblinStoreMgtGoodsAddParam implements Serializable {
         vo.setShelvesTime(this.getShelvesTime());
         vo.setSpuValidity(this.getSpuValidity());
         vo.setVirtualFlg(this.getVirtualFlg());
+        vo.setShowInMall(GoblinGoodsShowInMallHelper.defaultFromRequest(this.getShowInMall()));
         vo.setStatus("3");
 //        vo.setReason(null);
 //        vo.setShelvesStatus("0");
@@ -244,6 +252,7 @@ public class GoblinStoreMgtGoodsAddParam implements Serializable {
         vo.setShelvesTime(this.getShelvesTime());
         vo.setSpuValidity(this.getSpuValidity());
         vo.setVirtualFlg(this.getVirtualFlg());
+        vo.setShowInMall(GoblinGoodsShowInMallHelper.defaultFromRequest(this.getShowInMall()));
         vo.setImageList(this.getImageList());
         vo.setLogisticsTemplate(this.getLogisticsTemplate());
 //        vo.setErpType();// 暂不考虑更改ERP类型

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

@@ -4,6 +4,7 @@ import com.liquidnet.commons.lang.constant.LnsRegex;
 import com.liquidnet.commons.lang.util.CollectionUtil;
 import com.liquidnet.commons.lang.util.DateUtil;
 import com.liquidnet.commons.lang.util.IDGenerator;
+import com.liquidnet.service.goblin.constant.GoblinGoodsShowInMallHelper;
 import com.liquidnet.service.goblin.dto.GoblinGoodsSpecDto;
 import com.liquidnet.service.goblin.dto.vo.GoblinGoodsInfoVo;
 import com.liquidnet.service.goblin.dto.vo.GoblinGoodsSkuInfoVo;
@@ -189,6 +190,7 @@ public class GoblinStoreMgtGoodsCouponAddParam implements Serializable {
             vo.setShelvesStatus("0");
         }
         vo.setSpuAppear("0");
+        vo.setShowInMall(GoblinGoodsShowInMallHelper.SHOW_IN_MALL_YES);
         vo.setDelFlg("0");
 //        vo.setShelvesAt(null);
         vo.setImageList(this.getImageList());

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

@@ -5,6 +5,7 @@ import com.liquidnet.common.third.sqb.util.SqbAmountUtils;
 import com.liquidnet.commons.lang.constant.LnsRegex;
 import com.liquidnet.commons.lang.util.CollectionUtil;
 import com.liquidnet.commons.lang.util.IDGenerator;
+import com.liquidnet.service.goblin.constant.GoblinGoodsShowInMallHelper;
 import com.liquidnet.service.goblin.dto.GoblinGoodsSpecDto;
 import com.liquidnet.service.goblin.dto.vo.*;
 import io.swagger.annotations.ApiModel;
@@ -143,6 +144,7 @@ public class GoblinStoreMgtGoodsSqbAddParam implements Serializable {
         vo.setStatus("3");
         vo.setShelvesStatus("0");
         vo.setSpuAppear("0");
+        vo.setShowInMall(GoblinGoodsShowInMallHelper.resolve(vo));
         vo.setDelFlg("0");
         vo.setImageList(sqbGoods.getConverImages());
         vo.setLogisticsTemplate("");
@@ -164,6 +166,9 @@ public class GoblinStoreMgtGoodsSqbAddParam implements Serializable {
         vo.setDetails(sqbGoods.getProductIntroduction());
         vo.setCoverPic(CollectionUtil.isEmpty(sqbGoods.getConverImages()) ? "" : sqbGoods.getConverImages().get(0));
 //        vo.setImageList(sqbGoods.getConverImages());
+        if (vo.getShowInMall() == null) {
+            vo.setShowInMall(GoblinGoodsShowInMallHelper.resolve(vo));
+        }
         return vo;
     }
 

liquidnet-bus-api/liquidnet-service-goblin-api/src/main/java/com/liquidnet/service/goblin/dto/vo/GoblinGoodsInfoVo.java

@@ -91,6 +91,8 @@ public class GoblinGoodsInfoVo implements Serializable, Cloneable {
     private String shelvesStatus;
     @ApiModelProperty(position = 37, value = "是否隐藏[0-默认展示|1-隐藏]")
     private String spuAppear;
+    @ApiModelProperty(position = 37, value = "是否展示到商城[0-否|1-是]")
+    private Integer showInMall;
     @ApiModelProperty(position = 37, value = "是否购买[0-否|1-是]")
     private String spuCanbuy;
     @ApiModelProperty(position = 37, value = "创作者")

liquidnet-bus-api/liquidnet-service-goblin-api/src/main/java/com/liquidnet/service/goblin/dto/vo/GoblinStoreOrderVo.java

@@ -104,7 +104,7 @@ public class GoblinStoreOrderVo implements Serializable, Cloneable {
     private Integer payCountdownMinute;
     @ApiModelProperty(value = " 快递单号[废弃]")
     private String mailNo;
-    @ApiModelProperty(value = " 发货时间")
+    @ApiModelProperty(value = "订单完成时间")
     private String deliveryTime;
     @ApiModelProperty(value = " 物流公司姓名[废弃]")
     private String logisticsCompany;

liquidnet-bus-do/liquidnet-service-goblin-do/src/main/java/com/liquidnet/service/goblin/entity/GoblinGoods.java

@@ -200,6 +200,11 @@ public class GoblinGoods implements Serializable {
      */
     private String spuAppear;
 
+    /**
+     * 是否展示到商城[0-否|1-是]
+     */
+    private Integer showInMall;
+
     /**
      * 是否购买[0-否|1-是]
      */

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

+-- 普通商品是否展示到商城精选列表
+ALTER TABLE goblin_goods ADD COLUMN show_in_mall TINYINT(1) NOT NULL DEFAULT 1 COMMENT '是否展示到商城[0-否|1-是]' AFTER spu_appear;

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

@@ -79,6 +79,11 @@ public class GoblinFrontServiceImpl implements GoblinFrontService {
         return vo != null && vo.getSpuType() == 33;
     }
 
+    /** showInMall=0 时不展示到商城精选列表；历史数据无该字段时默认展示 */
+    private boolean isNotShowInMall(GoblinGoodsInfoVo vo) {
+        return vo != null && vo.getShowInMall() != null && vo.getShowInMall() == 0;
+    }
+
     /**
      * 单场次演出下全部关联关系（status=1）：先读 Redis {@link GoblinRedisUtils#getSqbPerformanceGoodsListCache}，
      * 未命中再查库并回写，与 {@link #getPerformanceSelectGoods} 一致。
@@ -919,7 +924,7 @@ public class GoblinFrontServiceImpl implements GoblinFrontService {
             query.addCriteria(Criteria.where("spuId").nin(spuids.split(",")));
         }
         query.addCriteria(Criteria.where("delFlg").is("0").and("shelvesStatus").is("3").and("spuAppear").is("0").and("marketId").is(null)
-                .and("spuType").ne(33).and("cateFid").nin("22196120924543", "22196122839313").and("name").not().regex(Pattern.compile(SELECT_GOODS_EXCLUDE_NAME)));
+                .and("spuType").ne(33).and("showInMall").ne(0).and("cateFid").nin("22196120924543", "22196122839313").and("name").not().regex(Pattern.compile(SELECT_GOODS_EXCLUDE_NAME)));
 
 
         //redis里面获取排序规则 1、上架时间2、销量3、价格高到低4、价格低到高
@@ -1038,7 +1043,7 @@ public class GoblinFrontServiceImpl implements GoblinFrontService {
                 } else {
                     GoblinGoodsInfoVo goblinGoodsInfoVo = goblinRedisUtils.getGoodsInfoVo(goblinFrontSelectGoods.getSpuId());
                     if (null == goblinGoodsInfoVo || StringUtil.isNotBlank(goblinGoodsInfoVo.getMarketId()) || isPassportExclusive(goblinGoodsInfoVo)
-                            || isSqbSpuGoods(goblinGoodsInfoVo)) {
+                            || isSqbSpuGoods(goblinGoodsInfoVo) || isNotShowInMall(goblinGoodsInfoVo)) {
                         it.remove();
                     }
                 }
@@ -1086,6 +1091,9 @@ public class GoblinFrontServiceImpl implements GoblinFrontService {
                         if (isSqbSpuGoods(goblinGoodsInfoVo)) {
                             continue;
                         }
+                        if (isNotShowInMall(goblinGoodsInfoVo)) {
+                            continue;
+                        }
                         goblinGoodsInfoVoArrayList.add(goblinGoodsInfoVo);
                     }
                 }
@@ -1150,6 +1158,9 @@ public class GoblinFrontServiceImpl implements GoblinFrontService {
                     if (isSqbSpuGoods(goblinGoodsInfoVo)) {
                         continue;
                     }
+                    if (isNotShowInMall(goblinGoodsInfoVo)) {
+                        continue;
+                    }
                     goblinGoodsInfoVoArrayList.add(goblinGoodsInfoVo);
                 }
             }

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

@@ -33,8 +33,7 @@ import java.util.List;
 import java.util.Objects;
 import java.util.stream.IntStream;
 
-import static com.liquidnet.commons.lang.util.DateUtil.DTF_YMD_HMS;
-import static com.liquidnet.commons.lang.util.DateUtil.DTFYMDHMS;
+import static com.liquidnet.commons.lang.util.DateUtil.*;
 
 
 @Service
@@ -201,7 +200,7 @@ public class GoblinOrderAppServiceImpl implements IGoblinOrderAppService {
     public ResponseDto<Boolean> getProduce(String orderId, String uid) {
         LocalDateTime now = LocalDateTime.now();
         LinkedList<String> sqls = CollectionUtil.linkedListString();
-        sqls.add(SqlMapping.get("goblin_order.store.orderStatus"));
+        sqls.add(SqlMapping.get("goblin_order.store.orderStatus.time"));
         sqls.add(SqlMapping.get("goblin_order.store.orderSkuStatus"));
         LinkedList<Object[]> orderStatus = CollectionUtil.linkedListObjectArr();
         LinkedList<Object[]> orderSkuStatus = CollectionUtil.linkedListObjectArr();
@@ -215,8 +214,9 @@ public class GoblinOrderAppServiceImpl implements IGoblinOrderAppService {
         }
         //订单状态修改
         orderVo.setStatus(GoblinStatusConst.Status.ORDER_STATUS_4.getValue());
+        orderVo.setDeliveryTime(getNowTime()); // 设置收货时间
         orderStatus.add(new Object[]{
-                orderVo.getStatus(), orderVo.getZhengzaiStatus(), now,
+                orderVo.getStatus(), orderVo.getZhengzaiStatus(), now, now,
                 orderVo.getOrderId(), now, now
         });
         for (String orderSkuId : orderVo.getOrderSkuVoIds()) {
@@ -274,7 +274,7 @@ public class GoblinOrderAppServiceImpl implements IGoblinOrderAppService {
         }
 
         if (!(orderVo.getStatus() == GoblinStatusConst.Status.ORDER_STATUS_2.getValue() ||
-                orderVo.getStatus() == GoblinStatusConst.Status.ORDER_STATUS_3.getValue() ||
+//                orderVo.getStatus() == GoblinStatusConst.Status.ORDER_STATUS_3.getValue() ||
                 orderVo.getStatus() == GoblinStatusConst.Status.ORDER_STATUS_4.getValue())) {
             return ResponseDto.failure("不可操作");
         }
@@ -774,19 +774,30 @@ public class GoblinOrderAppServiceImpl implements IGoblinOrderAppService {
     //获取 可申请退款时间
     private LocalDateTime getCanRefundTime(GoblinStoreOrderVo orderVo) {
         LocalDateTime canRefundTimeDateTime = null;
-        if (orderVo.getStatus() == GoblinStatusConst.Status.ORDER_STATUS_2.getValue() || orderVo.getStatus() == GoblinStatusConst.Status.ORDER_STATUS_4.getValue()) {
+        if (orderVo.getStatus() == GoblinStatusConst.Status.ORDER_STATUS_2.getValue()) {
             try {
                 // 允许退款修改成发货时间+14天
 //                canRefundTimeDateTime = LocalDateTime.parse(orderVo.getPayTime(), DTF_YMD_HMS).plusDays(7);
+//                if (StringUtil.isBlank(orderVo.getDeliveryTime())) {
+//                    canRefundTimeDateTime = LocalDateTime.parse(orderVo.getPayTime(), DTF_YMD_HMS).plusDays(7);
+//                }else {
+//                    canRefundTimeDateTime = LocalDateTime.parse(orderVo.getDeliveryTime(), DTF_YMD_HMS).plusDays(14);
+//                }
+                // 未发货商品 可直接退款
+                canRefundTimeDateTime = LocalDateTime.now().plusDays(7);
+//                log.info("[getCanRefundTime] 未发货商品可退款时间: {}", canRefundTimeDateTime);
+            } catch (Exception e) {
+                e.printStackTrace();
+            }
+        } else if (orderVo.getStatus() == GoblinStatusConst.Status.ORDER_STATUS_4.getValue()) {
             if (StringUtil.isBlank(orderVo.getDeliveryTime())) {
                 canRefundTimeDateTime = LocalDateTime.parse(orderVo.getPayTime(), DTF_YMD_HMS).plusDays(7);
             }else {
-                    canRefundTimeDateTime = LocalDateTime.parse(orderVo.getDeliveryTime(), DTF_YMD_HMS).plusDays(14);
-                }
-            } catch (Exception e) {
-                e.printStackTrace();
+                canRefundTimeDateTime = LocalDateTime.parse(orderVo.getDeliveryTime(), DTF_YMD_HMS).plusDays(7);
             }
         }
+        log.info("[getCanRefundTime] 订单可退款时间: orderId: {}, orderStatus: {}, canRefundTimeDateTime: {}",
+                orderVo.getOrderId(), orderVo.getStatus(), canRefundTimeDateTime);
         return canRefundTimeDateTime;
     }
 

liquidnet-bus-service/liquidnet-service-goblin/liquidnet-service-goblin-impl/src/main/java/com/liquidnet/service/goblin/service/impl/manage/GoblinStoreMgtGoodsImportService.java

@@ -12,6 +12,7 @@ import com.liquidnet.commons.lang.util.IDGenerator;
 import com.liquidnet.commons.lang.util.JsonUtils;
 import com.liquidnet.service.base.SqlMapping;
 import com.liquidnet.service.base.constant.MQConst;
+import com.liquidnet.service.goblin.constant.GoblinGoodsShowInMallHelper;
 import com.liquidnet.service.goblin.dto.GoblinGoodsImportDto;
 import com.liquidnet.service.goblin.dto.GoblinGoodsSpecDto;
 import com.liquidnet.service.goblin.dto.vo.GoblinGoodsInfoVo;
@@ -173,7 +174,9 @@ public class GoblinStoreMgtGoodsImportService {
                     for (int i = 0, size = goodsInfoVos.size(); i < size; i++) {
                         GoblinGoodsInfoVo goodsInfoVo = goodsInfoVos.get(i);
                         initGoodsObjs.add(new Object[] { goodsInfoVo.getSpuId(), goodsInfoVo.getSpuNo(),
-                                goodsInfoVo.getSpuBarCode(), goodsInfoVo.getName(), goodsInfoVo.getSubtitle(),
+                                goodsInfoVo.getSpuBarCode(), goodsInfoVo.getSpuErpCode(),
+                                StringUtils.isBlank(goodsInfoVo.getErpType()) ? "WANGDIAN" : goodsInfoVo.getErpType(),
+                                goodsInfoVo.getName(), goodsInfoVo.getSubtitle(),
                                 goodsInfoVo.getSellPrice(), goodsInfoVo.getPriceGe(), goodsInfoVo.getPriceLe(),
                                 goodsInfoVo.getIntro(), goodsInfoVo.getDetails(),
                                 goodsInfoVo.getCoverPic(), goodsInfoVo.getVideo(), goodsInfoVo.getSpecMode(),
@@ -183,6 +186,7 @@ public class GoblinStoreMgtGoodsImportService {
                                 goodsInfoVo.getBrandId(), goodsInfoVo.getShelvesHandle(), goodsInfoVo.getShelvesTime(),
                                 goodsInfoVo.getSpuValidity(), goodsInfoVo.getVirtualFlg(),
                                 goodsInfoVo.getStatus(), goodsInfoVo.getShelvesStatus(), goodsInfoVo.getSpuAppear(),
+                                GoblinGoodsShowInMallHelper.resolve(goodsInfoVo),
                                 goodsInfoVo.getShelvesAt(), goodsInfoVo.getCreatedBy(),
                                 goodsInfoVo.getCreatedAt(), goodsInfoVo.getLogisticsTemplate() });
                         if (!CollectionUtils.isEmpty(goodsInfoVo.getImageList())) {
@@ -455,6 +459,7 @@ public class GoblinStoreMgtGoodsImportService {
         lastGoodsInfoVo.setStatus("3");
         lastGoodsInfoVo.setShelvesStatus("0");
         lastGoodsInfoVo.setSpuAppear("0");// *
+        lastGoodsInfoVo.setShowInMall(GoblinGoodsShowInMallHelper.SHOW_IN_MALL_YES);
         lastGoodsInfoVo.setSpuCanbuy("1");
         lastGoodsInfoVo.setDelFlg("0");
         lastGoodsInfoVo.setCreatedAt(now);

liquidnet-bus-service/liquidnet-service-goblin/liquidnet-service-goblin-impl/src/main/java/com/liquidnet/service/goblin/service/impl/manage/GoblinStoreMgtGoodsServiceImpl.java

@@ -8,6 +8,7 @@ import com.liquidnet.commons.lang.util.JsonUtils;
 import com.liquidnet.service.base.PagedResult;
 import com.liquidnet.service.base.SqlMapping;
 import com.liquidnet.service.base.constant.MQConst;
+import com.liquidnet.service.goblin.constant.GoblinGoodsShowInMallHelper;
 import com.liquidnet.service.goblin.constant.GoblinStatusConst;
 import com.liquidnet.service.goblin.dto.GoblinGoodsSpecDto;
 import com.liquidnet.service.goblin.dto.manage.*;
@@ -145,7 +146,7 @@ public class GoblinStoreMgtGoodsServiceImpl implements IGoblinstoreMgtGoodsServi
         goblinMongoUtils.setGoodsInfoVo(goodsInfoVo);
         goblinMongoUtils.setGoodsSkuInfoVos(goodsSkuInfoVoList);
 
-        if (goodsInfoVo.getShelvesHandle().equals("2")) {
+        if (goodsInfoVo.getShelvesHandle().equals("2") || Integer.valueOf(0).equals(goodsInfoVo.getShowInMall())) {
             goblinRedisUtils.deleteKeyForSelectGoods();// 精选商品:商品上架、下架、删除 调用的方法
         }
 
@@ -233,6 +234,7 @@ public class GoblinStoreMgtGoodsServiceImpl implements IGoblinstoreMgtGoodsServi
                 goodsInfoVo.getShelvesHandle(), goodsInfoVo.getShelvesTime(),
                 goodsInfoVo.getSpuValidity(), goodsInfoVo.getVirtualFlg(), goodsInfoVo.getStatus(),
                 goodsInfoVo.getShelvesStatus(), goodsInfoVo.getSpuAppear(),
+                GoblinGoodsShowInMallHelper.resolve(goodsInfoVo),
                 goodsInfoVo.getShelvesAt(), createdBy, createdAt, goodsInfoVo.getLogisticsTemplate()
         });
         toMqSqls.add(SqlMapping.get("goblin_goods_sku.insert"));
@@ -727,6 +729,11 @@ public class GoblinStoreMgtGoodsServiceImpl implements IGoblinstoreMgtGoodsServi
         }
         updateSpuInfoVo.setUpdatedBy(uid);
         updateSpuInfoVo.setUpdatedAt(LocalDateTime.now());
+        int newShowInMall = GoblinGoodsShowInMallHelper.resolve(updateSpuInfoVo);
+        int oldShowInMall = GoblinGoodsShowInMallHelper.resolve(mgtGoodsInfoVo);
+        if (newShowInMall != oldShowInMall) {
+            goblinRedisUtils.deleteKeyForSelectGoods();
+        }
         if (goblinMongoUtils.updateGoodsInfoVo(updateSpuInfoVo)) {
             log.info("商品管理:SPU编辑[UID={},PARAMS={}]", uid, JsonUtils.toJson(storeMgtGoodsAddParam));
             GoblinGoodsSkuInfoVo updateSkuInfoVo = GoblinGoodsSkuInfoVo.getNew();
@@ -758,6 +765,7 @@ public class GoblinStoreMgtGoodsServiceImpl implements IGoblinstoreMgtGoodsServi
                             updateSpuInfoVo.getSpuValidity(), updateSpuInfoVo.getVirtualFlg(),
                             updateSpuInfoVo.getLogisticsTemplate(), updateSpuInfoVo.getUpdatedBy(),
                             updateSpuInfoVo.getUpdatedAt(), updateSpuInfoVo.getSpuErpCode(),
+                            newShowInMall,
                             marketSpuId
                     });
                     updateGoodsSkuObjs.add(new Object[] {
@@ -787,6 +795,7 @@ public class GoblinStoreMgtGoodsServiceImpl implements IGoblinstoreMgtGoodsServi
                     updateSpuInfoVo.getSpuValidity(), updateSpuInfoVo.getVirtualFlg(),
                     updateSpuInfoVo.getLogisticsTemplate(), updateSpuInfoVo.getUpdatedBy(),
                     updateSpuInfoVo.getUpdatedAt(), updateSpuInfoVo.getSpuErpCode(),
+                    newShowInMall,
                     updateSpuInfoVo.getSpuId()
             });
             toMqSqls.add(SqlMapping.get("goblin_goods_sku.update_by_edit_spu"));
@@ -1164,6 +1173,7 @@ public class GoblinStoreMgtGoodsServiceImpl implements IGoblinstoreMgtGoodsServi
                             updateSpuInfoVo.getSpuValidity(), updateSpuInfoVo.getVirtualFlg(),
                             updateSpuInfoVo.getLogisticsTemplate(), updateSpuInfoVo.getUpdatedBy(),
                             updateSpuInfoVo.getUpdatedAt(), updateSpuInfoVo.getSpuErpCode(),
+                            GoblinGoodsShowInMallHelper.resolve(updateSpuInfoVo),
                             marketSpuId
                     });
                     updateGoodsSkuObjs.add(new Object[] {
@@ -1192,6 +1202,7 @@ public class GoblinStoreMgtGoodsServiceImpl implements IGoblinstoreMgtGoodsServi
                     updateSpuInfoVo.getSpuValidity(), updateSpuInfoVo.getVirtualFlg(),
                     updateSpuInfoVo.getLogisticsTemplate(), updateSpuInfoVo.getUpdatedBy(),
                     updateSpuInfoVo.getUpdatedAt(), updateSpuInfoVo.getSpuErpCode(),
+                    GoblinGoodsShowInMallHelper.resolve(updateSpuInfoVo),
                     updateSpuInfoVo.getSpuId()
             });
             toMqSqls.add(SqlMapping.get("goblin_goods_sku.update_by_edit_coupon_spu"));

liquidnet-bus-service/liquidnet-service-goblin/liquidnet-service-goblin-impl/src/main/java/com/liquidnet/service/goblin/service/impl/manage/GoblinStoreMgtSqbGoodsServiceImpl.java

@@ -14,6 +14,7 @@ import com.liquidnet.commons.lang.util.JsonUtils;
 import com.liquidnet.service.base.ResponseDto;
 import com.liquidnet.service.base.SqlMapping;
 import com.liquidnet.service.base.constant.MQConst;
+import com.liquidnet.service.goblin.constant.GoblinGoodsShowInMallHelper;
 import com.liquidnet.service.goblin.dto.GoblinGoodsSpecDto;
 import com.liquidnet.service.goblin.dto.manage.GoblinStoreMgtGoodsSqbAddParam;
 import com.liquidnet.service.goblin.dto.manage.vo.GoblinMgtCategorySpecVo;
@@ -361,6 +362,7 @@ public class GoblinStoreMgtSqbGoodsServiceImpl implements IGoblinStoreMgtSqbGood
                     updateSpuInfoVo.getSpuValidity(), updateSpuInfoVo.getVirtualFlg(),
                     updateSpuInfoVo.getLogisticsTemplate(), updateSpuInfoVo.getUpdatedBy(),
                     updateSpuInfoVo.getUpdatedAt(), updateSpuInfoVo.getSpuErpCode(),
+                    GoblinGoodsShowInMallHelper.resolve(updateSpuInfoVo),
                     updateSpuInfoVo.getSpuId()
             });
 

liquidnet-bus-service/liquidnet-service-goblin/liquidnet-service-goblin-impl/src/main/java/com/liquidnet/service/goblin/service/impl/manage/GoblinStoreOrderServiceImpl.java

@@ -618,7 +618,7 @@ public class GoblinStoreOrderServiceImpl implements IGoblinStoreOrderService {
         LinkedList<Object[]> sqlsOrder = CollectionUtil.linkedListObjectArr();
         LinkedList<Object[]> sqlsOrderSku = CollectionUtil.linkedListObjectArr();
         LinkedList<Object[]> sqlsMail = CollectionUtil.linkedListObjectArr();
-        sqls.add(SqlMapping.get("goblin_order.store.expressTime"));
+        sqls.add(SqlMapping.get("goblin_order.store.express"));
         sqls.add(SqlMapping.get("goblin_order.store.orderSkuStatus"));
         sqls.add(SqlMapping.get("goblin_order.mail"));
 //        GoblinStoreInfoVo storeInfoVo = redisUtils.getStoreInfoVoByUid(uid);
@@ -701,15 +701,14 @@ public class GoblinStoreOrderServiceImpl implements IGoblinStoreOrderService {
         log.setType(GoblinStatusConst.Status.ORDER_LOG_STATUS_13.getValue());
         log.setRemark("发货：orderId=[" + orderId + "],orderSkuId=[" + StringUtils.join(skuIds, ",") + "],mailNo=[" + mailNo + "]");
 
-        // 发货时间
-        orderVo.setDeliveryTime(nowStr);
+
         //redis
         redisUtils.setGoblinOrder(orderId, orderVo);
         //mongo
         mongoUtils.updateGoblinStoreOrderVo(orderId, orderVo);
         //mysql
         sqlsOrder.add(new Object[]{
-                orderVo.getStatus(), now, now, orderId, now, now
+                orderVo.getStatus(), now, orderId, now, now
         });
         queueUtils.sendMsgByRedis(MQConst.GoblinQueue.GOBLIN_STORE_ORDER_OPERA.getKey(),
                 SqlMapping.gets(sqls, sqlsOrder, sqlsOrderSku, sqlsMail));

liquidnet-bus-service/liquidnet-service-goblin/liquidnet-service-goblin-impl/src/main/resources/sqlmap.properties

@@ -36,12 +36,12 @@ goblin_goods_sku_spec_value.update_by_edit=UPDATE goblin_goods_sku_spec_value SE
 goblin_goods_sku_spec_value.update_by_del_sku=UPDATE goblin_goods_sku_spec_value SET del_flg='1' WHERE sku_id=? AND del_flg='0' 
 #----                   \u5546\u54C1\u4FE1\u606F
 #goblin_goods.insert=INSERT INTO goblin_goods (spu_id,spu_no,spu_bar_code,name,subtitle,sell_price, price_ge,price_le,intro,details,cover_pic, video,spec_mode,store_id,cate_fid,cate_sid, cate_tid,store_cate_fid,store_cate_sid,store_cate_tid,brand_id, shelves_handle,shelves_time,spu_validity,virtual_flg,status, shelves_status,spu_appear,shelves_at,created_by,created_at, logistics_template)VALUES(?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?)
-goblin_goods.insert=INSERT INTO goblin_goods (spu_id,spu_no,spu_bar_code,spu_erp_code,erp_type,name,subtitle,sell_price, price_ge,price_le,intro,details,cover_pic, video,spec_mode,store_id,cate_fid,cate_sid, cate_tid,store_cate_fid,store_cate_sid,store_cate_tid,brand_id, shelves_handle,shelves_time,spu_validity,virtual_flg,status, shelves_status,spu_appear,shelves_at,created_by,created_at, logistics_template)VALUES(?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?) 
+goblin_goods.insert=INSERT INTO goblin_goods (spu_id,spu_no,spu_bar_code,spu_erp_code,erp_type,name,subtitle,sell_price, price_ge,price_le,intro,details,cover_pic, video,spec_mode,store_id,cate_fid,cate_sid, cate_tid,store_cate_fid,store_cate_sid,store_cate_tid,brand_id, shelves_handle,shelves_time,spu_validity,virtual_flg,status, shelves_status,spu_appear,show_in_mall,shelves_at,created_by,created_at, logistics_template)VALUES(?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?) 
 goblin_goods.insert_for_coupon=INSERT INTO goblin_goods (spu_id,spu_no,spu_bar_code,spu_erp_code,erp_type,spu_type,name,subtitle,sell_price, price_ge,price_le,intro,details,cover_pic, video,spec_mode,store_id,cate_fid,cate_sid, cate_tid,store_cate_fid,store_cate_sid,store_cate_tid,brand_id, shelves_handle,shelves_time,spu_validity,virtual_flg,status, shelves_status,spu_appear,shelves_at,created_by,created_at, logistics_template)VALUES(?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?) 
 #goblin_goods.insert_for_digital=INSERT INTO goblin_goods (spu_id,spu_no,spu_type,name,intro,attention,store_id,cate_fid,cate_sid,cate_tid,virtual_flg,status,shelves_status,spu_appear,author,publisher,created_by,created_at)VALUES(?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?)
 goblin_goods.insert_for_digital=INSERT INTO goblin_goods (spu_id,spu_no,spu_type,name,intro,attention,store_id,cate_fid,cate_sid,cate_tid,virtual_flg,status,shelves_status,spu_appear,author,publisher,created_by,created_at,spu_erp_code)VALUES(?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?) 
 #goblin_goods.update_by_edit=UPDATE goblin_goods SET spu_no=?,name=?,subtitle=?,sell_price=?,intro=?,details=?,cover_pic=?,video=?,spec_mode=?,cate_fid=?,cate_sid=?,cate_tid=?,shelves_handle=?,shelves_time=?,spu_validity=?,virtual_flg=?,logistics_template=?,updated_by=?,updated_at=? WHERE spu_id=? AND del_flg='0'
-goblin_goods.update_by_edit=UPDATE goblin_goods SET spu_no=?,name=?,subtitle=?,sell_price=?,intro=?,details=?,cover_pic=?,video=?,spec_mode=?,cate_fid=?,cate_sid=?,cate_tid=?,shelves_handle=?,shelves_time=?,spu_validity=?,virtual_flg=?,logistics_template=?,updated_by=?,updated_at=?,spu_erp_code=? WHERE spu_id=? AND del_flg='0' 
+goblin_goods.update_by_edit=UPDATE goblin_goods SET spu_no=?,name=?,subtitle=?,sell_price=?,intro=?,details=?,cover_pic=?,video=?,spec_mode=?,cate_fid=?,cate_sid=?,cate_tid=?,shelves_handle=?,shelves_time=?,spu_validity=?,virtual_flg=?,logistics_template=?,updated_by=?,updated_at=?,spu_erp_code=?,show_in_mall=? WHERE spu_id=? AND del_flg='0' 
 #goblin_goods.update_by_edit_for_digital=UPDATE goblin_goods SET name=?,intro=?,cate_fid=?,cate_sid=?,cate_tid=?,updated_by=?,updated_at=? WHERE spu_id=? AND del_flg='0'
 goblin_goods.update_by_edit_for_digital=UPDATE goblin_goods SET name=?,intro=?,cate_fid=?,cate_sid=?,cate_tid=?,updated_by=?,updated_at=?,spu_erp_code=? WHERE spu_id=? AND del_flg='0' 
 goblin_goods.update_by_shelves=UPDATE goblin_goods SET shelves_status=?,shelves_at=?,updated_by=?,updated_at=? WHERE spu_id=? AND store_id=? AND spu_appear='0'
@@ -133,6 +133,7 @@ goblin_order.store.changeExpress=UPDATE goblin_back_order SET real_back_price =
 goblin_order.store.changeSku=UPDATE goblin_back_order SET real_back_price = ? , updated_at = ? WHERE back_order_id = ? and (updated_at <= ? or created_at = ? or updated_at is null)
 goblin_order.store.backOrderStatus=UPDATE goblin_back_order SET status = ? , refuse_at=?,refuse_size=?,updated_at = ? WHERE back_order_id = ? and (updated_at <= ? or created_at = ? or updated_at is null)
 goblin_order.store.orderStatus=UPDATE goblin_store_order SET status = ? ,zhengzai_status=?, updated_at = ? WHERE order_id = ? and (updated_at <= ? or created_at = ? or updated_at is null)
+goblin_order.store.orderStatus.time=UPDATE goblin_store_order SET status = ? ,zhengzai_status=?, updated_at = ?, delivery_time = ? WHERE order_id = ? and (updated_at <= ? or created_at = ? or updated_at is null)
 goblin_order.store.applyRefund=UPDATE goblin_back_order SET status = ? ,reason=?,audit_at=?, updated_at = ? WHERE back_order_id = ? and (updated_at <= ? or created_at = ? or updated_at is null)
 #----                   \u7528\u6237\u8BA2\u5355\u64CD\u4F5C
 goblin_order.user.applyRefund=INSERT INTO goblin_back_order (`back_order_id`,`back_code`,`order_id`,`order_code`,`store_id`,`user_id`,`sku_id_nums`,`type`,`reason`,`describes`,`real_back_price`,`back_price_express`,`status`,`logis_company_name`,`mail_no`,`pics`,`created_at`) VALUES (?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?)
@@ -195,7 +196,7 @@ goblin_nft_order.update_artwork=UPDATE goblin_nft_order SET artwork_id=? WHERE o
 goblin_sku.stock=UPDATE goblin_goods_sku SET sku_stock = ? , stock = ?, updated_at = ? WHERE sku_erp_code = ? and erp_warehouse_no = ?
 #----
 candy_user_coupon.update_apply_refund=UPDATE candy_user_coupon SET state=?,operator=?,updated_at=? WHERE ucoupon_id=? 
-# \u6536\u94B1\u5427\u4E0B\u5355 INSERT \u5DF2\u8FC1\u81F3 order \u670D\u52A1\uff1aliquidnet-service-order-impl/sqlmap.properties \u4E2D goblin_sqb_order.insert
+# \u6536\u94B1\u5427\u4E0B\u5355 INSERT \u5DF2\u8FC1\u81F3 order \u670D\u52A1\uFF1Aliquidnet-service-order-impl/sqlmap.properties \u4E2D goblin_sqb_order.insert
 
 # ---- \u624B\u73AF\u8BA2\u5355 ----
 goblin_bracelet_order_insert = INSERT INTO `goblin_bracelet_order`(`order_id`, `user_id`, `bind_name`, `bind_mobile`, `bind_idcard`, `req_date`, `goods_desc`, `wristband_id`, `wristband_price`, `amount_id`, `amount_price`, `req_seq_id`, `hf_seq_id`, `trade_type`, `party_order_id`, `price`, `price_total`, `price_refund`, `refund_price_charges`, `refund_number`, `status`, `pay_status`, `created_at`, `updated_at`) VALUES (?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?)

liquidnet-bus-service/liquidnet-service-kylin/liquidnet-service-kylin-impl/src/main/resources/sqlmap.properties

@@ -4,7 +4,7 @@ kylin_lack_register.insert=INSERT INTO `kylin_lack_registers`(`lack_registers_id
 # ------------------------PV/UV----------------------------
 bi_ticket_access_records.insert=INSERT INTO `bi_ticket_access_records` (  `user_id`,  `access_type`,  `performance_id`,  `order_id`,  `order_code`,`ip_address`,  `area`,  `area_province`,  `area_city`,  `area_county`,`created_at`) VALUES (?,?,?,?,?,?,?,?,?,?,?);
 # ------------------------\u521B\u5EFA\u8BA2\u5355----------------------------
-kylin_order_ticket.add=INSERT INTO kylin_order_tickets(order_tickets_id,user_id,user_name,user_mobile,performance_title,order_code,qr_code,order_type,order_version,order_source,referrer_user_id,`number`,price,price_member,price_total,price_voucher,price_actual,price_express,price_refund,refund_number,pay_type,payment_type,time_pay,express_contacts,express_address,express_phone,coupon_type,get_ticket_type,get_ticket_describe,pay_countdown_minute,`comment`,created_at,updated_at,pay_code,ip_address,area,area_province,area_city,area_county)VALUES(?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?)
+kylin_order_ticket.add=INSERT INTO kylin_order_tickets(order_tickets_id,user_id,user_name,user_mobile,performance_title,order_code,qr_code,order_type,order_version,order_source,referrer_user_id,`number`,price,price_member,price_total,price_voucher,price_actual,price_express,price_refund,refund_number,pay_type,payment_type,time_pay,express_contacts,express_address,express_phone,coupon_type,get_ticket_type,get_ticket_describe,pay_countdown_minute,`comment`,created_at,updated_at,pay_code,ip_address,area,area_province,area_city,area_county)VALUES(?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?)
 kylin_order_ticket_relation.add=INSERT INTO kylin_order_ticket_relations(order_ticket_relations_id ,order_id ,transfer_id ,live_id ,agent_id ,is_member ,performance_id ,time_id ,ticket_id ,created_at ,updated_at,agent_status,agent_distributions,agent_id_master,agent_distributions_master)VALUES(?,?,?,?,?,?,?,?,?,?,?,?,?,?,?)
 kylin_order_ticket_status.add=INSERT INTO kylin_order_ticket_status(order_ticket_status_id ,order_id ,express_type ,is_student ,transfer_status ,`status` ,pay_status , produce_code, created_at ,updated_at)VALUES(?,?,?,?,?,?,?,?,?,?)
 kylin_order_ticket_entities.add=INSERT INTO kylin_order_ticket_entities(order_ticket_entities_id ,order_id ,ticket_id ,user_id ,time_id ,performance_id ,enter_type ,enter_name ,enter_mobile,enter_id_code,`status`,sys_damai,check_client,is_payment,`comment`,created_at,updated_at)VALUES(?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?)

liquidnet-bus-service/liquidnet-service-order/liquidnet-service-order-impl/src/main/resources/sqlmap.properties

@@ -4,7 +4,7 @@ kylin_lack_register.insert=INSERT INTO `kylin_lack_registers`(`lack_registers_id
 # ------------------------PV/UV----------------------------
 bi_ticket_access_records.insert=INSERT INTO `bi_ticket_access_records` (  `user_id`,  `access_type`,  `performance_id`,  `order_id`,  `order_code`,`ip_address`,  `area`,  `area_province`,  `area_city`,  `area_county`,`created_at`) VALUES (?,?,?,?,?,?,?,?,?,?,?);
 # ------------------------\u521B\u5EFA\u8BA2\u5355----------------------------
-kylin_order_ticket.add=INSERT INTO kylin_order_tickets(order_tickets_id,user_id,user_name,user_mobile,performance_title,order_code,qr_code,order_type,order_version,order_source,referrer_user_id,`number`,price,price_member,price_total,price_voucher,price_actual,price_express,price_refund,refund_number,pay_type,payment_type,time_pay,express_contacts,express_address,express_phone,coupon_type,get_ticket_type,get_ticket_describe,pay_countdown_minute,`comment`,created_at,updated_at,pay_code,ip_address,area,area_province,area_city,area_county)VALUES(?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?)
+kylin_order_ticket.add=INSERT INTO kylin_order_tickets(order_tickets_id,user_id,user_name,user_mobile,performance_title,order_code,qr_code,order_type,order_version,order_source,referrer_user_id,`number`,price,price_member,price_total,price_voucher,price_actual,price_express,price_refund,refund_number,pay_type,payment_type,time_pay,express_contacts,express_address,express_phone,coupon_type,get_ticket_type,get_ticket_describe,pay_countdown_minute,`comment`,created_at,updated_at,pay_code,ip_address,area,area_province,area_city,area_county)VALUES(?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?)
 kylin_order_ticket_relation.add=INSERT INTO kylin_order_ticket_relations(order_ticket_relations_id ,order_id ,transfer_id ,live_id ,agent_id ,is_member ,performance_id ,time_id ,ticket_id ,created_at ,updated_at,agent_status,agent_distributions,agent_id_master,agent_distributions_master)VALUES(?,?,?,?,?,?,?,?,?,?,?,?,?,?,?)
 kylin_order_ticket_status.add=INSERT INTO kylin_order_ticket_status(order_ticket_status_id ,order_id ,express_type ,is_student ,transfer_status ,`status` ,pay_status , produce_code ,created_at ,updated_at)VALUES(?,?,?,?,?,?,?,?,?,?)
 kylin_order_ticket_entities.add=INSERT INTO kylin_order_ticket_entities(order_ticket_entities_id ,order_id ,ticket_id ,user_id ,time_id ,performance_id ,enter_type ,enter_name ,enter_mobile,enter_id_code,`status`,sys_damai,check_client,is_payment,`comment`,created_at,updated_at)VALUES(?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?)