Merge branch 'master' into bak220720_merge

# Conflicts:
#	liquidnet-bus-service/liquidnet-service-order/liquidnet-service-order-impl/src/main/java/com/liquidnet/service/order/service/impl/KylinOrderTicketsServiceImpl.java

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

+package com.liquidnet.service.goblin.dto.vo;
+
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotNull;
+import java.io.Serializable;
+import java.util.List;
+
+@Api
+@Data
+public class CouponCountVo implements Serializable, Cloneable {
+    @ApiModelProperty(dataType = "String", name = "storeCouponIds", value = "券ID",example = "1",required = true)
+    @NotNull @NotBlank
+    private String storeCouponId;
+    @ApiModelProperty(dataType = "Integer", name = "count", value = "领取数量",example = "10",required = true)
+    @NotNull @NotBlank
+    private Integer count;
+
+    private static final CouponCountVo obj = new CouponCountVo();
+
+    public static CouponCountVo getNew() {
+        try {
+            return (CouponCountVo) obj.clone();
+        } catch (CloneNotSupportedException e) {
+            e.printStackTrace();
+        }
+        return new CouponCountVo();
+    }
+}

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

@@ -62,7 +62,12 @@ public class GoblinOrderSkuVo implements Serializable, Cloneable {
     private BigDecimal priceVoucher;
     @ApiModelProperty(value = "创建时间")
     private String createdAt;
+    @ApiModelProperty(value = "核销时间")
+    private String pushTime;
 
+    public String getPushTime() {
+        return pushTime==null?"":pushTime;
+    }
 
     public GoblinOrderSkuVo copy(GoblinOrderSku source) {
         if (null == source) return this;

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

@@ -14,6 +14,7 @@ public class GoblinPosGoodsVo implements Serializable, Cloneable {
     private BigDecimal price;
     private String spuId;
     private String spuName;
+    private Integer restStock;
 
     private static final GoblinPosGoodsVo obj = new GoblinPosGoodsVo();
 

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

@@ -125,6 +125,12 @@ public class GoblinStoreOrderVo implements Serializable, Cloneable {
     private String mixId;
     @ApiModelProperty(value = "混合售名称")
     private String mixName;
+    @ApiModelProperty(value = "核销时间")
+    private String pushTime;
+
+    public String getPushTime() {
+        return pushTime==null?"":pushTime;
+    }
 
     public BigDecimal getPriceModify() {
         if (priceModify == null) {

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

@@ -22,6 +22,8 @@ public class TempCouponVo implements  Cloneable{
     private String storeCouponId;
     @ApiModelProperty(position = 7, value = "是否默认用券")
     private int isDefault;
+    @ApiModelProperty(position = 8, value = "券vo")
+    private GoblinStoreCouponVo vo;
 
     private static final TempCouponVo obj = new TempCouponVo();
 

liquidnet-bus-api/liquidnet-service-goblin-api/src/main/java/com/liquidnet/service/goblin/param/CouponCountParam.java

+package com.liquidnet.service.goblin.param;
+
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotNull;
+import java.io.Serializable;
+import java.util.List;
+
+@Api
+@Data
+public class CouponCountParam implements Serializable, Cloneable {
+    @ApiModelProperty(dataType = "String", name = "storeCouponIds", value = "券ID数组",example = "1",required = true)
+    @NotNull @NotBlank
+    private List<String> storeCouponIds;
+    @ApiModelProperty(dataType = "String", name = "uid", value = "用户id",example = "10",required = true)
+    @NotNull @NotBlank
+    private String uid;
+
+    private static final CouponCountParam obj = new CouponCountParam();
+
+    public static CouponCountParam getNew() {
+        try {
+            return (CouponCountParam) obj.clone();
+        } catch (CloneNotSupportedException e) {
+            e.printStackTrace();
+        }
+        return new CouponCountParam();
+    }
+}

liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-web/src/main/resources/templates/zhengzai/smile/volunteers/edit.html

@@ -29,7 +29,7 @@
             <label class="col-sm-3 control-label is-required">头像：</label>
             <div class="col-sm-8">
                 <!--                <input name="img" class="form-control" type="text" th:value="*{img}" readonly required>-->
-                <img class="img-details" style="height: 400px;" name="img" th:src="*{img}"
+                <img class="img-details" style="height: 400px;" name="img" th:src="*{img+'?x-oss-process=image/resize,s_400'}"
                      th:onclick="click_big([[*{img}]])">
             </div>
         </div>

liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-web/src/main/resources/templates/zhengzai/store/placingOrder/addNewActivity.html

@@ -70,7 +70,7 @@
                 选择演出：
             </span>
             <div class="input-group" style="width: 300px;">
-                <input type="text" class="form-control" id="selectShow" placeholder="">
+                <input type="text" class="form-control select-show editDisabled" id="selectShow" placeholder="">
                 <div class="input-group-btn">
                     <button type="button" class="btn btn-white dropdown-toggle" data-toggle="dropdown">
                         <span class="caret"></span>
@@ -78,7 +78,7 @@
                     <ul class="dropdown-menu dropdown-menu-right" role="menu">
                     </ul>
                 </div>
-                <!-- /btn-group -->
+                <!-- /btn-group 11 -->
             </div>
         </div>
         <div class="basis_data">
@@ -86,13 +86,13 @@
                 <em class="required">*</em>
                 有效期：
             </span>
-            <input type="text" class="layui-input form-control" id="startTime" autocomplete="off" placeholder="请选择活动开始时间">
+            <input type="text" class="layui-input form-control editDisabled" id="startTime" autocomplete="off" placeholder="请选择活动开始时间">
             ~  
-            <input type="text" class="layui-input form-control" id="endTime"  style="margin-left: 10px;" autocomplete="off" placeholder="请选择活动结束时间">
-        </div>
-        <div class="first_footer" style="padding-left: 60px;margin-top: 12px;">
-            <button class="btn btn-primary" onclick="nextBtn()">确定</button>
+            <input type="text" class="layui-input form-control editDisabled"  id="endTime" style="margin-left: 10px;" autocomplete="off" placeholder="请选择活动结束时间">
         </div>
+       <div class="first_footer editshow" style="padding-left: 60px;margin-top: 12px;">
+           <button class="btn btn-primary" onclick="nextBtn()">确定</button>
+       </div>
     </div>
     <div class="content_item" style="display: none;">
         <div class="content_title">
@@ -153,6 +153,8 @@
         common ();
         if (r) {
             marketId =  unescape(r[2]);
+            $(".editDisabled").attr('disabled', true);
+            $(".editshow").hide()
             let data = {
                 marketId
             }
@@ -173,6 +175,8 @@
                 })
             })
         }
+
+
     })
     function common () {
         $("#selectShow").bsSuggest({
@@ -219,13 +223,13 @@
         if (item) {
             body+=`<div class="activityStore_item" data-newTag="">
                 <div class="input-group" style="margin-right: 12px;">
-                    <input type="text" class="form-control storeList item${count}" data-id="${item.storeId}" value="${item.storeName}" placeholder="搜索店铺名称">
+                    <input type="text" class="form-control storeList item${count} itemDisabled" data-id="${item.storeId}" value="${item.storeName}" placeholder="搜索店铺名称">
                     <div class="input-group-btn">
                         <ul class="dropdown-menu dropdown-menu-right" role="menu">
                         </ul>
                     </div>
                 </div>
-                <input type="text" class="layui-input form-control timeSp startTime${count}" id="startTime" value="${item.showTime}" autocomplete="off" placeholder="配置活动时间">
+                <input type="text" class="layui-input form-control timeSp startTime${count} itemDisabled" id="startTime" value="${item.showTime}" autocomplete="off" placeholder="配置活动时间">
             </div>`
         } else {
             body+=`<div class="activityStore_item" data-newTag="1">
@@ -239,9 +243,9 @@
                 <input type="text" class="layui-input form-control timeSp startTime${count}" id="startTime" autocomplete="off" placeholder="配置活动时间">
             </div>`
         }
-        
         $(".activityStore").append(body)
         common ()
+        $(".itemDisabled").attr('disabled', true);
         layui.use('laydate', function(){
             var laydate = layui.laydate;
             //执行一个laydate实例

liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-zhengzai/src/main/java/com/liquidnet/client/admin/zhengzai/goblin/service/impl/GoblinZhengzaiMarketServiceImpl.java

@@ -53,7 +53,7 @@ public class GoblinZhengzaiMarketServiceImpl implements IGoblinZhengzaiMarketSer
     GoblinMarketingZhengzaiRelationMapper goblinMarketingZhengzaiRelationMapper;
 
     @Override
-    public ResponseDto<List<GoblinSelfMarketingDto>> zhengzaiList(int page,int size, String purchaseName, int status, String st, String et, String ct) {
+    public ResponseDto<List<GoblinSelfMarketingDto>> zhengzaiList(int page, int size, String purchaseName, int status, String st, String et, String ct) {
 //        LambdaUpdateWrapper<GoblinSelfMarketing> queryMapper = Wrappers.lambdaUpdate(GoblinSelfMarketing.getNew()).eq(GoblinSelfMarketing::getDelFlag, 0);
 //        switch (status) {
 //            case 0://未开始

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

@@ -129,6 +129,8 @@ public class GoblinOrderSku implements Serializable,Cloneable {
 
     private LocalDateTime updatedAt;
 
+    private LocalDateTime pushTime;
+
     private String comment;
 
     private static final GoblinOrderSku obj = new GoblinOrderSku();

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

@@ -324,6 +324,8 @@ public class GoblinStoreOrder implements Serializable,Cloneable {
 
     private LocalDateTime updatedAt;
 
+    private LocalDateTime pushTime;
+
     private String comment;
 
     private static final GoblinStoreOrder obj = new GoblinStoreOrder();

liquidnet-bus-do/liquidnet-service-goblin-do/src/main/resources/com.liquidnet.service.goblin.mapper/GoblinSelfMarketingMapper.xml

@@ -41,7 +41,7 @@
 
 
     <select id="getZhengzaiStoreList" resultMap="goblinZhengzaiStoreListDtoResult">
-select d.store_id,
+select b.store_id,
        c.store_name,
        b.show_time,
        IFNull(count(distinct d.spu_id), 0) as 'spu_count',
@@ -51,7 +51,7 @@ from goblin_self_marketing as a
          inner join goblin_store_info as c on c.store_id = b.store_id
          left join goblin_marketing_zhengzai as d on d.store_id = b.store_id  and d.self_market_id = b.self_market_id
 where a.self_market_id = #{marketId}
-GROUP BY d.store_id
+GROUP BY b.store_id
     </select>
 
     <select id="getZhengzaiStoreDetails" resultMap="goblinZhengzaiStoreDetailsDtoResult">

liquidnet-bus-service/liquidnet-service-dragon/liquidnet-service-dragon-impl/src/main/java/com/liquidnet/service/dragon/channel/wepay/strategy/impl/AbstractWepayStrategy.java

@@ -121,9 +121,22 @@ public abstract class AbstractWepayStrategy implements IWepayStrategy {
             }
         } catch (Exception e) {
             e.printStackTrace();
+            log.info("微信预支付报错{}",e);
+            if(dragonPayBaseReqDto.getDeviceFrom().equals(DragonConstant.DeviceFromEnum.MICROPAY.getCode())){
+                return timeOutDeal(dragonPayBaseReqDto,null);
+            }
         }
         return null;
     }
+    public ResponseDto<DragonPayBaseRespDto> timeOutDeal(DragonPayBaseReqDto dragonPayBaseReqDto,WepayPayRespDto respWepayDto){
+        DragonPayBaseRespDto respPayDto = this.buildCommonRespDto(dragonPayBaseReqDto,respWepayDto);
+        //构造自定义返回参数
+        this.buildResponseDto(respPayDto,respWepayDto);
+        respPayDto.setMsg("等待用户付款");
+        //支付订单持久化
+        dragonServiceCommonBiz.buildPayOrders(dragonPayBaseReqDto,respPayDto);
+        return ResponseDto.success(respPayDto);
+    }
 
     /**
      * 构造公共返回参数
@@ -137,15 +150,17 @@ public abstract class AbstractWepayStrategy implements IWepayStrategy {
         respDto.setOrderCode(dragonPayBaseReqDto.getOrderCode());
         respDto.setPayType(dragonPayBaseReqDto.getPayType());
         DragonPayBaseRespDto.PayData payData = new DragonPayBaseRespDto.PayData();
-        payData.setAppId(respWepayDto.getAppid());
         payData.setNonceStr(nonceStr);
-        payData.setPackages("prepay_id="+respWepayDto.getPrepayId());
         payData.setSignType("MD5");
         Long second = LocalDateTime.now().toEpochSecond(ZoneOffset.of("+8"));
         payData.setTimeStamp(second+"");
-        payData.setPartnerId(respWepayDto.getMchId());
-        payData.setPrepayId(respWepayDto.getPrepayId());
         respDto.setPayData(payData);
+        if(null!=respWepayDto){
+            payData.setAppId(respWepayDto.getAppid());
+            payData.setPackages("prepay_id="+respWepayDto.getPrepayId());
+            payData.setPartnerId(respWepayDto.getMchId());
+            payData.setPrepayId(respWepayDto.getPrepayId());
+        }
         return respDto;
     }
 

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

@@ -68,3 +68,13 @@ ALTER TABLE goblin_nft_order
     ADD mix_id VARCHAR(64) NOT NULL DEFAULT '' COMMENT '组合售id';
 ALTER TABLE goblin_store_order
     ADD mix_id VARCHAR(64) NOT NULL DEFAULT '' COMMENT '组合售id';
+
+-- 2022年07月28日11:00:36 增加 核销时间字段
+ALTER TABLE goblin_order_sku
+    ADD push_time datetime  DEFAULT NULL COMMENT '核销时间';
+ALTER TABLE goblin_store_order
+    ADD push_time datetime  DEFAULT NULL COMMENT '核销时间';
+ALTER TABLE goblin_store_order
+    ADD mix_code varchar(128) DEFAULT NULL COMMENT '混合售订单号';
+ALTER TABLE goblin_nft_order
+    ADD mix_code varchar(128)  DEFAULT NULL COMMENT '混合售订单号';
\ No newline at end of file

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

@@ -6,7 +6,9 @@ import com.liquidnet.common.exception.constant.ErrorCode;
 import com.liquidnet.commons.lang.util.CurrentUtil;
 import com.liquidnet.service.base.ErrorMapping;
 import com.liquidnet.service.base.ResponseDto;
+import com.liquidnet.service.goblin.constant.GoblinStatusConst;
 import com.liquidnet.service.goblin.dto.vo.*;
+import com.liquidnet.service.goblin.param.CouponCountParam;
 import com.liquidnet.service.goblin.service.GoblinCouponService;
 import com.liquidnet.service.goblin.util.GoblinRedisUtils;
 import com.liquidnet.service.goblin.util.ObjectUtil;
@@ -100,11 +102,61 @@ public class GoblinPosController {
                     posGoodsVo.setPrice(goodsSkuInfoVo.getPrice());
                     posGoodsVo.setSpuId(spuId);
                     posGoodsVo.setSpuName(goodsInfoVo.getName());
-
-                    posGoodsVoList.add(posGoodsVo);
+                    String pre = GoblinStatusConst.MarketPreStatus.getPre(spuId);
+                    int stock = goblinRedisUtils.getSkuStock(pre, skuId);
+                    posGoodsVo.setRestStock(stock);
+                    if (stock > 0) {
+                        posGoodsVoList.add(posGoodsVo);
+                    }
                 }
             }
         }
         return ResponseDto.success(posGoodsVoList);
     }
+
+//    @PostMapping("coupon/count")
+//    @ApiOperation("券领取次数")
+//    @ResponseBody
+//    public ResponseDto<List<CouponCountVo>> couponCount(@RequestBody CouponCountParam param) {
+//        String uid = param.getUid();
+//        List<String> storeCouponIds = param.getStoreCouponIds();
+//        List<GoblinUserCouponVo> userCouponVos = goblinRedisUtils.getUserCouponVos(uid);
+//        List<CouponCountVo> voList = ObjectUtil.couponCountVos();
+//        for (String storeCouponId : storeCouponIds) {
+//            if (!CollectionUtils.isEmpty(userCouponVos)) {
+//                int beforeSize = userCouponVos.size();
+//                userCouponVos.removeIf(vo -> vo.getStoreCouponId().equals(storeCouponId));
+//                int receiveCount = (beforeSize - userCouponVos.size());
+//                CouponCountVo single = CouponCountVo.getNew();
+//                single.setStoreCouponId(storeCouponId);
+//                single.setCount(receiveCount);
+//                voList.add(single);
+//            }
+//        }
+//        return ResponseDto.success(voList);
+//    }
+
+    @PostMapping("coupon/count")
+    @ApiOperation("券领取次数")
+    @ApiImplicitParams({
+            @ApiImplicitParam(type = "form", required = true, dataType = " List<String>", name = "storeCouponId", value = "平台券id"),
+            @ApiImplicitParam(type = "form", required = true, dataType = "String", name = "uid", value = "UID"),
+    })
+    public ResponseDto<List<CouponCountVo>> couponCount(@NotBlank(message = "参数无效:storeCouponId") @RequestParam("storeCouponId") List<String> storeCouponIds,
+                                                         @NotBlank(message = "参数无效:uid") @RequestParam("uid") String uid) {
+        List<GoblinUserCouponVo> userCouponVos = goblinRedisUtils.getUserCouponVos(uid);
+        List<CouponCountVo> voList = ObjectUtil.couponCountVos();
+        for (String storeCouponId : storeCouponIds) {
+            if (!CollectionUtils.isEmpty(userCouponVos)) {
+                int beforeSize = userCouponVos.size();
+                userCouponVos.removeIf(vo -> vo.getStoreCouponId().equals(storeCouponId));
+                int receiveCount = (beforeSize - userCouponVos.size());
+                CouponCountVo single = CouponCountVo.getNew();
+                single.setStoreCouponId(storeCouponId);
+                single.setCount(receiveCount);
+                voList.add(single);
+            }
+        }
+        return ResponseDto.success(voList);
+    }
 }

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

@@ -51,15 +51,15 @@ public class GoblinStoreZhengzaiController {
         return goblinStoreZhengzaiService.orderList(page);
     }
 
-    @PostMapping("orderPush")
-    @ApiOperation("正在下单-出货")
-    @ApiResponse(code = 200, message = "接口返回对象参数")
-    @ApiImplicitParams({
-            @ApiImplicitParam(type = "form", required = true, dataType = "String", name = "orderMasterCode", value = "主订单号"),
-    })
-    public ResponseDto<Boolean> orderPush(@RequestParam("orderMasterCode") @Valid String orderMasterCode) {
-        return goblinStoreZhengzaiService.orderPush(orderMasterCode);
-    }
+//    @PostMapping("orderPush")
+//    @ApiOperation("正在下单-出货")
+//    @ApiResponse(code = 200, message = "接口返回对象参数")
+//    @ApiImplicitParams({
+//            @ApiImplicitParam(type = "form", required = true, dataType = "String", name = "orderMasterCode", value = "主订单号"),
+//    })
+//    public ResponseDto<Boolean> orderPush(@RequestParam("orderMasterCode") @Valid String orderMasterCode) {
+//        return goblinStoreZhengzaiService.orderPush(orderMasterCode);
+//    }
 
     @PostMapping("listByCode")
     @ApiOperation("列表[根据masterCode]")

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

@@ -15,6 +15,7 @@ import org.springframework.stereotype.Service;
 
 import java.math.BigDecimal;
 import java.time.LocalDateTime;
+import java.time.format.DateTimeFormatter;
 import java.util.LinkedList;
 import java.util.List;
 import java.util.stream.Collectors;
@@ -91,8 +92,8 @@ public class GoblinAppZhengzaiServiceImpl implements IGoblinAppZhengzaiService {
         LinkedList<String> sqls = CollectionUtil.linkedListString();
         LinkedList<Object[]> sqlDataOrder = CollectionUtil.linkedListObjectArr();
         LinkedList<Object[]> sqlDataSku = CollectionUtil.linkedListObjectArr();
-        sqls.add(SqlMapping.get("goblin_order.store.orderStatus"));
-        sqls.add(SqlMapping.get("goblin_order.store.orderSkuStatus"));
+        sqls.add(SqlMapping.get("goblin_order.store.orderPush"));
+        sqls.add(SqlMapping.get("goblin_order.store.orderSkuPush"));
         String uid = CurrentUtil.getCurrentUid();
         GoblinStoreInfoVo storeInfoVo = redisUtils.getStoreInfoVoByUid(uid);
         if (storeInfoVo == null) {
@@ -103,7 +104,7 @@ public class GoblinAppZhengzaiServiceImpl implements IGoblinAppZhengzaiService {
         } else {
             for (String orderId : orderIds) {
                 GoblinStoreOrderVo storeOrderVo = redisUtils.getGoblinOrder(orderId);
-                if (!storeInfoVo.getStoreId().equals(storeOrderVo.getStoreId())|| !(storeOrderVo.getWriteOffCode().equals(offCode))) {
+                if (!storeInfoVo.getStoreId().equals(storeOrderVo.getStoreId()) || !(storeOrderVo.getWriteOffCode().equals(offCode))) {
                     continue;
                 }
                 if (storeOrderVo.getStatus().equals(GoblinStatusConst.Status.ORDER_STATUS_0.getValue())) {
@@ -117,16 +118,18 @@ public class GoblinAppZhengzaiServiceImpl implements IGoblinAppZhengzaiService {
                 }
                 storeOrderVo.setStatus(GoblinStatusConst.Status.ORDER_STATUS_4.getValue());
                 storeOrderVo.setZhengzaiStatus(1);
+                storeOrderVo.setPushTime(now.format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")));
                 sqlDataOrder.add(new Object[]{
-                        storeOrderVo.getStatus(),storeOrderVo.getZhengzaiStatus(), now,
+                        storeOrderVo.getStatus(), storeOrderVo.getZhengzaiStatus(), now, now,
                         storeOrderVo.getOrderId(), now, now
                 });
                 List<String> skuIds = storeOrderVo.getOrderSkuVoIds();
                 for (String skuId : skuIds) {
                     GoblinOrderSkuVo skuInfoVo = redisUtils.getGoblinOrderSkuVo(skuId);
                     skuInfoVo.setStatus(GoblinStatusConst.Status.ORDER_STATUS_4.getValue());
+                    skuInfoVo.setPushTime(now.format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")));
                     sqlDataSku.add(new Object[]{
-                            skuInfoVo.getStatus(), now,
+                            skuInfoVo.getStatus(), now, now,
                             skuInfoVo.getOrderSkuId(), now, now
                     });
                     redisUtils.setGoblinOrderSku(skuInfoVo.getOrderSkuId(), skuInfoVo);
@@ -202,7 +205,7 @@ public class GoblinAppZhengzaiServiceImpl implements IGoblinAppZhengzaiService {
                 mongoUtils.updateGoblinStoreOrderVo(storeOrderVo.getOrderId(), storeOrderVo);
                 //redis
                 redisUtils.setGoblinOrder(storeOrderVo.getOrderId(), storeOrderVo);
-                redisUtils.addZhengzaiOrderList(uid,orderId);
+                redisUtils.addZhengzaiOrderList(uid, orderId);
                 //mysql
                 queueUtils.sendMsgByRedis(MQConst.GoblinQueue.GOBLIN_STORE_ORDER_OPERA.getKey(),
                         SqlMapping.get("goblin_order.zhengzai.bind",

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

@@ -79,6 +79,9 @@ public class GoblinMixAppServiceImpl implements IGoblinMixAppService {
     @Override
     public ResponseDto<GoblinMixAppDetailsVo> mixDetails(String mixId) {
         GoblinMixDetailsVo baseVo = redisUtils.getMixDetails(mixId);
+        if(baseVo==null){
+            return ResponseDto.failure("参数异常");
+        }
         GoblinStoreInfoVo storeInfoVo = redisUtils.getStoreInfoVo(baseVo.getStoreId());
         GoblinMixAppDetailsVo vo = GoblinMixAppDetailsVo.getNew().copy(baseVo, storeInfoVo.getStoreName());
         int stock = 0;

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

@@ -67,6 +67,7 @@ public class GoblinInnerServiceImpl implements IGoblinInnerService {
         List<String> ucouponIds = redisUtils.getMarketTempCoupon(performanceId);
         for (String ucouponId : ucouponIds) {
             TempCouponVo tempCouponVo = redisUtils.getTempCoupon(ucouponId);
+            tempCouponVo.setVo(redisUtils.getStoreCouponVo(tempCouponVo.getStoreCouponId()));
             tempCouponVos.add(tempCouponVo);
         }
         vo.setTempCouponVos(tempCouponVos);

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

@@ -99,13 +99,20 @@ public class ObjectUtil {
     private static final ArrayList<GoblinMixDetailsItemVo> goblinMixDetailsItemVo = new ArrayList<>();
     private static final ArrayList<GoblinMixManageListVo> goblinMixManageListVo = new ArrayList<>();
     private static final ArrayList<GoblinMixAppListVo> goblinMixAppListVo = new ArrayList<>();
+    private static final ArrayList<CouponCountVo> couponCountVos = new ArrayList<>();
     private static final ArrayList<GoblinMixDetailsVo> goblinMixDetailsVo = new ArrayList<>();
+
     private static final HashMap<String, String[]> mixIdMap = new HashMap();
 
     public static HashMap<String, String[]> mixIdMap() {
         return (HashMap<String, String[]>) mixIdMap.clone();
     }
 
+
+    public static ArrayList<CouponCountVo> couponCountVos() {
+        return (ArrayList<CouponCountVo>) couponCountVos.clone();
+    }
+
     public static ArrayList<GoblinMixAppListVo> goblinMixAppListVo() {
         return (ArrayList<GoblinMixAppListVo>) goblinMixAppListVo.clone();
     }

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

@@ -85,18 +85,18 @@ goblin.store.market.delSpuRelation=UPDATE goblin_store_market_purchasing SET del
 goblin.self.market.insertRelation=INSERT INTO goblin_marketing_zhengzai (`zhengzai_id`,`self_market_id`,`spu_id`,`sku_id`,`store_id`,`price_marketing`,`stock_marketing`,`buy_factor`,`buy_roster`,`buy_limit`,`del_flag`,`created_at`) VALUES (?,?,?,?,?,?,?,?,?,?,?,?)
 goblin.self.market.updateRelation=UPDATE goblin_marketing_zhengzai SET price_marketing=? ,stock_marketing=? , buy_factor=?,buy_roster=?,buy_limit=?,updated_at=? WHERE self_market_id =? and store_id =?
 goblin.self.market.delSpuRelation=UPDATE goblin_marketing_zhengzai SET del_flag = ?,updated_at = ? WHERE self_market_id =? and store_id =? and spu_id=?
-#----                   \u8BA2\u5355\u521B\u5EFA&\u652F\u4ED8
-goblin_order.pay.order=UPDATE goblin_store_order SET payment_type = ? ,payment_id=?,pay_code = ? ,pay_time = ?,write_off_code = ? ,zhengzai_status =?,status = ? ,updated_at = ? WHERE order_id = ? and (updated_at <= ? or created_at = ? or updated_at is null)
-goblin_order.pay.sku=UPDATE goblin_order_sku SET status = ? ,updated_at = ?  WHERE order_sku_id = ? and (updated_at <= ? or created_at = ? or updated_at is null)
 #----                   \u8BA2\u5355\u7ED1\u5B9A[\u6B63\u5728\u4E0B\u5355] \u51FA\u8D27
 goblin_order.zhengzai.bind=UPDATE goblin_store_order SET user_id = ? ,updated_at = ? WHERE order_id = ? and (updated_at <= ? or created_at = ? or updated_at is null)
 goblin_order.zhengzai.push=UPDATE goblin_store_order SET zhengzai_status = ? ,status = ?,updated_at = ? WHERE order_id = ? and (updated_at <= ? or created_at = ? or updated_at is null)
 #----                   \u5546\u94FA\u8BA2\u5355\u64CD\u4F5C
 goblin_order.store.cancel=UPDATE goblin_store_order SET status = ? ,cancel_time = ? , cancel_reason = ? , updated_at = ? WHERE order_id = ? and (updated_at <= ? or created_at = ? or updated_at is null)
 goblin_order.store.orderSkuStatus=UPDATE goblin_order_sku SET status = ? , updated_at = ? WHERE order_sku_id = ? and (updated_at <= ? or created_at = ? or updated_at is null)
+goblin_order.store.orderSkuPush=UPDATE goblin_order_sku SET status = ? , updated_at = ?,push_time = ? WHERE order_sku_id = ? and (updated_at <= ? or created_at = ? or updated_at is null)
+goblin_order.store.orderPush=UPDATE goblin_store_order SET status = ? ,zhengzai_status=?, updated_at = ?,push_time = ? WHERE order_id = ? and (updated_at <= ? or created_at = ? or updated_at is null)
+
 goblin_order.store.express=UPDATE goblin_store_order SET status = ? , updated_at = ? WHERE order_id = ? and (updated_at <= ? or created_at = ? or updated_at is null)
 goblin_order.mail=INSERT INTO goblin_mail (`mail_id`,`order_id`,`mail_no`,`delivery_time`,`logistics_company`,`order_sku_ids`,`created_at`) VALUES (?,?,?,?,?,?,?)
-goblin_order.mail.update=UPDATE goblin_mail SET mail_no = ? , updated_at = ? WHERE mail_id = ? 
+goblin_order.mail.update=UPDATE goblin_mail SET mail_no = ? , updated_at = ? WHERE mail_id = ?
 goblin_order.store.address=UPDATE goblin_order_attr SET express_contacts = ? ,express_address_detail = ? , express_phone = ? , updated_at = ? WHERE order_id = ? and (updated_at <= ? or created_at = ? or updated_at is null)
 goblin_order.store.orderPrice=UPDATE goblin_store_order SET price_modify = ? ,price_voucher = ? , price_actual = ? , updated_at = ? WHERE order_id = ? and (updated_at <= ? or created_at = ? or updated_at is null)
 goblin_order.store.orderSkuPrice=UPDATE goblin_order_sku SET price_modify = ? ,price_voucher = ? , sku_price_actual = ? , updated_at = ? WHERE order_sku_id = ? and (updated_at <= ? or created_at = ? or updated_at is null)

liquidnet-bus-service/liquidnet-service-kylin/liquidnet-service-kylin-impl/src/main/java/com/liquidnet/service/kylin/service/impl/KylinPerformancesServiceImpl.java

@@ -491,7 +491,7 @@ public class KylinPerformancesServiceImpl implements IKylinPerformancesService {
         performancesInfo.setMessage(KylinPerformanceStatusEnum.getName(performancesInfo.getAppStatus()));
 
         PayDetailVo payDetailVo = new PayDetailVo();
-        if (ticketVo.getIsExpress() == 1) {
+        if (ticketVo!=null && ticketVo.getIsExpress() == 1) {
             KylinTicketExpressModuleVo expressModuleVo = dataUtils.getTEMVo(ticketsId);
             payDetailVo.setExpressModuleList(expressModuleVo == null ? null : expressModuleVo.getProduceCodeList());
         } else {

liquidnet-bus-service/liquidnet-service-order/liquidnet-service-order-impl/src/main/java/com/liquidnet/service/order/service/impl/GoblinNftOrderServiceImpl.java

@@ -532,7 +532,7 @@ public class GoblinNftOrderServiceImpl implements IGoblinNftOrderService {
                     nftOrder.getNum(), nftOrder.getStoreId(), nftOrder.getStoreName(), nftOrder.getOrderCode(), nftOrder.getUserId(), nftOrder.getUserName(), nftOrder.getUserMobile(), nftOrder.getPriceTotal(), nftOrder.getPriceCoupon(),
                     nftOrder.getStorePriceCoupon(), nftOrder.getPriceRedEnvelope(), nftOrder.getPriceVoucher(), nftOrder.getPriceActual(), nftOrder.getUcouponId(), nftOrder.getStoreCouponId(), nftOrder.getRedEnvelopeCode(), nftOrder.getStatus(), nftOrder.getSource(),
                     nftOrder.getOrderType(), nftOrder.getPayType(), nftOrder.getDeviceFrom(), nftOrder.getVersion(), nftOrder.getPayCountdownMinute(), nftOrder.getIpAddress(), nftOrder.getCreatedAt(), nftOrder.getPayCode(),
-                    nftOrder.getSkuTitle(), nftOrder.getListId(), nftOrder.getExCode(),""
+                    nftOrder.getSkuTitle(), nftOrder.getListId(), nftOrder.getExCode(),"",""
             });
 
             // 订单vo
@@ -945,7 +945,7 @@ public class GoblinNftOrderServiceImpl implements IGoblinNftOrderService {
                         nftOrder.getNum(), nftOrder.getStoreId(), nftOrder.getStoreName(), nftOrder.getOrderCode(), nftOrder.getUserId(), nftOrder.getUserName(), nftOrder.getUserMobile(), nftOrder.getPriceTotal(), nftOrder.getPriceCoupon(),
                         nftOrder.getStorePriceCoupon(), nftOrder.getPriceRedEnvelope(), nftOrder.getPriceVoucher(), nftOrder.getPriceActual(), nftOrder.getUcouponId(), nftOrder.getStoreCouponId(), nftOrder.getRedEnvelopeCode(), orderVo.getStatus(), nftOrder.getSource(),
                         nftOrder.getOrderType(), orderVo.getPayType(), nftOrder.getDeviceFrom(), nftOrder.getVersion(), nftOrder.getPayCountdownMinute(), nftOrder.getIpAddress(), nftOrder.getCreatedAt(), orderVo.getPayCode(),
-                        nftOrder.getSkuTitle(), nftOrder.getListId(), nftOrder.getExCode(),""
+                        nftOrder.getSkuTitle(), nftOrder.getListId(), nftOrder.getExCode(),"",""
                 });
                 String sqlData = SqlMapping.gets(sqls, sqlDataCode, sqlDataOrder);
                 queueUtils.sendMsgByRedis(MQConst.GoblinQueue.GOBLIN_NFT_ORDER.getKey(), sqlData);

liquidnet-bus-service/liquidnet-service-order/liquidnet-service-order-impl/src/main/java/com/liquidnet/service/order/service/impl/GoblinOrderServiceImpl.java

@@ -579,7 +579,7 @@ public class GoblinOrderServiceImpl implements IGoblinOrderService {
             sqlDataOrder.add(new Object[]{
                     storeOrder.getMasterOrderCode(), storeOrder.getOrderId(), storeOrder.getStoreId(), storeOrder.getStoreName(), storeOrder.getOrderCode(), storeOrder.getUserId(), storeOrder.getUserName(), storeOrder.getUserMobile(), storeOrder.getPriceTotal(), storeOrder.getPayCode(),
                     storeOrder.getPriceActual(), storeOrder.getPriceRefund(), storeOrder.getPriceExpress(), storeOrder.getPriceCoupon(), storeOrder.getStorePriceCoupon(), storeOrder.getPriceVoucher(), storeOrder.getStatus(), storeOrder.getUcouponId(), storeOrder.getStoreCouponId(), storeOrder.getPayType(), storeOrder.getDeviceFrom(),
-                    storeOrder.getSource(), storeOrder.getVersion(), storeOrder.getIsMember(), storeOrder.getOrderType(), storeOrder.getWriteOffCode(), storeOrder.getPayCountdownMinute(), storeOrder.getIpAddress(), storeOrder.getMarketId(), storeOrder.getMarketType(), storeOrder.getCreatedAt(), ""
+                    storeOrder.getSource(), storeOrder.getVersion(), storeOrder.getIsMember(), storeOrder.getOrderType(), storeOrder.getWriteOffCode(), storeOrder.getPayCountdownMinute(), storeOrder.getIpAddress(), storeOrder.getMarketId(), storeOrder.getMarketType(), storeOrder.getCreatedAt(), "",""
             });
             GoblinOrderAttr orderAttr = item.getOrderAttr();
             sqlDataAttr.add(new Object[]{
@@ -800,11 +800,13 @@ public class GoblinOrderServiceImpl implements IGoblinOrderService {
                 if (orderVo.getDeviceFrom().equals("micropay") && GoblinStatusConst.MarketPreStatus.MARKET_PRE_ZHENGZAI.getValue().equals(orderVo.getMarketType())) {
                     storeOrder.setStatus(GoblinStatusConst.Status.ORDER_STATUS_4.getValue());
                     storeOrder.setZhengzaiStatus(1);
+                    storeOrder.setPushTime(now);
+                    orderVo.setPushTime(now.format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")));
                 }
                 storeOrder.setUpdatedAt(now);
                 sqls.add(SqlMapping.get("goblin_order.pay.order"));
                 sqlDataOrder.add(new Object[]{
-                        storeOrder.getPaymentType(), storeOrder.getPaymentId(), storeOrder.getPayCode(), storeOrder.getPayTime(), storeOrder.getWriteOffCode(), storeOrder.getZhengzaiStatus(), storeOrder.getStatus(), storeOrder.getUpdatedAt(),
+                        storeOrder.getPaymentType(), storeOrder.getPaymentId(), storeOrder.getPayCode(), storeOrder.getPayTime(), storeOrder.getWriteOffCode(), storeOrder.getZhengzaiStatus(), storeOrder.getStatus(), storeOrder.getUpdatedAt(),storeOrder.getPushTime(),
                         orderId, now, now
                 });
                 sqls.add(SqlMapping.get("goblin_order.pay.sku"));
@@ -817,6 +819,7 @@ public class GoblinOrderServiceImpl implements IGoblinOrderService {
                     orderSkuVo.setStatus(GoblinStatusConst.Status.ORDER_STATUS_2.getValue());
                     if (orderVo.getDeviceFrom().equals("micropay") && GoblinStatusConst.MarketPreStatus.MARKET_PRE_ZHENGZAI.getValue().equals(orderVo.getMarketType())) {
                         orderSkuVo.setStatus(GoblinStatusConst.Status.ORDER_STATUS_4.getValue());
+                        orderSkuVo.setPushTime(now.format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")));
                     }
                     //redis
                     redisUtils.setGoblinOrderSku(orderSkuVo.getOrderSkuId(), orderSkuVo);
@@ -845,7 +848,7 @@ public class GoblinOrderServiceImpl implements IGoblinOrderService {
                     mongoUtils.insertGoblinOrderLogVo(logVo);
                     //mysql
                     sqlDataSku.add(new Object[]{
-                            orderSkuVo.getStatus(), now,
+                            orderSkuVo.getStatus(), now,orderSkuVo.getStatus()==4?now:null,
                             orderSkuVo.getOrderSkuId(), now, now
                     });
                 }
@@ -1128,9 +1131,10 @@ public class GoblinOrderServiceImpl implements IGoblinOrderService {
                     storeOrder.setStatus(GoblinStatusConst.Status.ORDER_STATUS_4.getValue());
                     storeOrder.setZhengzaiStatus(1);
                     storeOrder.setUpdatedAt(now);
+                    storeOrder.setPushTime(now);
                     sqls.add(SqlMapping.get("goblin_order.pay.order"));
                     sqlDataOrder.add(new Object[]{
-                            storeOrder.getPaymentType(), storeOrder.getPaymentId(), storeOrder.getPayCode(), storeOrder.getPayTime(), storeOrder.getWriteOffCode(), storeOrder.getZhengzaiStatus(), storeOrder.getStatus(), storeOrder.getUpdatedAt(),
+                            storeOrder.getPaymentType(), storeOrder.getPaymentId(), storeOrder.getPayCode(), storeOrder.getPayTime(), storeOrder.getWriteOffCode(), storeOrder.getZhengzaiStatus(), storeOrder.getStatus(), storeOrder.getUpdatedAt(),storeOrder.getPushTime(),
                             orderId, now, now
                     });
                     sqls.add(SqlMapping.get("goblin_order.pay.sku"));
@@ -1167,7 +1171,7 @@ public class GoblinOrderServiceImpl implements IGoblinOrderService {
                         mongoUtils.insertGoblinOrderLogVo(logVo);
                         //mysql
                         sqlDataSku.add(new Object[]{
-                                orderSkuVo.getStatus(), now,
+                                orderSkuVo.getStatus(), now,now,
                                 orderSkuVo.getOrderSkuId(), now, now
                         });
                     }

liquidnet-bus-service/liquidnet-service-order/liquidnet-service-order-impl/src/main/java/com/liquidnet/service/order/service/impl/KylinOrderTicketsServiceImpl.java

@@ -129,7 +129,7 @@ public class KylinOrderTicketsServiceImpl implements IKylinOrderTicketsOrderServ
                 }
             }
 
-            if (performanceData == null || ticketTimesData == null || ticketData == null) {
+            if (ticketTimesData == null || ticketData == null) {
                 return ResponseDto.failure(ErrorMapping.get("20004"));//参数错误
             }
             if (performanceData.getStatusSell() == 0) {
@@ -204,6 +204,11 @@ public class KylinOrderTicketsServiceImpl implements IKylinOrderTicketsOrderServ
             }
 
             int memberType; //会员状态 不需要判断会员 1判断会员逻辑 2会员专属
+            if (DateUtil.compareStrDay(DateUtil.getNowTime(), memberTimeStart) == 1 && DateUtil.compareStrDay(DateUtil.getNowTime(), timeStart) == -1){//优先时间
+                if(payOrderParam.getNumber()>2){
+                    return ResponseDto.failure("非法下单");
+                }
+            }
             if (ticketData.getIsExclusive() == 1) {
                 memberType = 2;
                 if (!isMember) {
@@ -1074,12 +1079,12 @@ public class KylinOrderTicketsServiceImpl implements IKylinOrderTicketsOrderServ
     public ResponseDto<Integer> checkOrderResult(String orderId) {
         String uid = CurrentUtil.getCurrentUid();
         KylinOrderTicketVo orderTicketData = dataUtils.getOrderTicketVo(orderId);
-        if (!orderTicketData.getUserId().equals(uid)) {
-            return null;
-        }
         if (orderTicketData == null) {
             return ResponseDto.failure(ErrorMapping.get("20024"));
         } else {
+            if (!orderTicketData.getUserId().equals(uid)) {
+                return null;
+            }
             DragonPayOrderQueryRespDto data = dragonOrdersService.checkOrderStatusByCode(orderTicketData.getPayCode());
             SyncOrderParam syncOrderDtoParam = SyncOrderParam.getNew();
             syncOrderDtoParam.setCode(data.getCode());

liquidnet-bus-service/liquidnet-service-order/liquidnet-service-order-impl/src/main/java/com/liquidnet/service/order/service/impl/MixOrderServiceImpl.java

@@ -190,7 +190,7 @@ public class MixOrderServiceImpl implements IMixOrderService {
             //生成goblin订单
             GoblinOrderPreParam preParam = null;
             if (skuInfoList.size() > 0) {
-                preParam = goblinOrder(skuInfoList, skuMix, param.getAddressesVo(), mobile, source, version, nickName, nt, uid, param.getPayType(), param.getDeviceFrom(),orderMasterCode);
+                preParam = goblinOrder(skuInfoList, skuMix, param.getAddressesVo(), mobile, source, version, nickName, nt, uid, param.getPayType(), param.getDeviceFrom(), orderMasterCode);
             }
             return ResponseDto.success(payOrder(nftOrderList, preParam, orderMasterCode, param.getShowUrl(), param.getReturnUrl(), param.getDeviceFrom(), param.getPayType(), mixId, mixVo.getName(), param.getOpenId(), nt, storeName));
         } catch (Exception e) {
@@ -201,7 +201,7 @@ public class MixOrderServiceImpl implements IMixOrderService {
     }
 
     //商品订单
-    private GoblinOrderPreParam goblinOrder(List<GoblinGoodsSkuInfoVo> skuVoList, HashMap<String, Object> skuMix, AddressVo addressVo, String mobile, String source, String version, String nickName, LocalDateTime now, String uid, String payType, String deviceFrom,String masterCode) {
+    private GoblinOrderPreParam goblinOrder(List<GoblinGoodsSkuInfoVo> skuVoList, HashMap<String, Object> skuMix, AddressVo addressVo, String mobile, String source, String version, String nickName, LocalDateTime now, String uid, String payType, String deviceFrom, String masterCode) {
         String orderMasterCode = masterCode;
         String orderId = IDGenerator.nextSnowId();
         String orderCode = IDGenerator.storeCode(orderId);
@@ -457,7 +457,7 @@ public class MixOrderServiceImpl implements IMixOrderService {
                     nftItem.getNum(), nftItem.getStoreId(), nftItem.getStoreName(), nftItem.getOrderCode(), nftItem.getUserId(), nftItem.getUserName(), nftItem.getUserMobile(), nftItem.getPriceTotal(), nftItem.getPriceCoupon(),
                     nftItem.getStorePriceCoupon(), nftItem.getPriceRedEnvelope(), nftItem.getPriceVoucher(), nftItem.getPriceActual(), nftItem.getUcouponId(), nftItem.getStoreCouponId(), nftItem.getRedEnvelopeCode(), nftItem.getStatus(), nftItem.getSource(),
                     nftItem.getOrderType(), nftItem.getPayType(), nftItem.getDeviceFrom(), nftItem.getVersion(), nftItem.getPayCountdownMinute(), nftItem.getIpAddress(), nftItem.getCreatedAt(), nftItem.getPayCode(),
-                    nftItem.getSkuTitle(), nftItem.getListId(), nftItem.getExCode(), mixId
+                    nftItem.getSkuTitle(), nftItem.getListId(), nftItem.getExCode(), mixId,masterCode
             });
             // 订单vo redis
             GoblinNftOrderVo orderVo = GoblinNftOrderVo.getNew().copyMix(nftItem, mixId, mixName);
@@ -490,7 +490,7 @@ public class MixOrderServiceImpl implements IMixOrderService {
             sqlDataGoblin.add(new Object[]{
                     storeOrder.getMasterOrderCode(), storeOrder.getOrderId(), storeOrder.getStoreId(), storeOrder.getStoreName(), storeOrder.getOrderCode(), storeOrder.getUserId(), storeOrder.getUserName(), storeOrder.getUserMobile(), storeOrder.getPriceTotal(), storeOrder.getPayCode(),
                     storeOrder.getPriceActual(), storeOrder.getPriceRefund(), storeOrder.getPriceExpress(), storeOrder.getPriceCoupon(), storeOrder.getStorePriceCoupon(), storeOrder.getPriceVoucher(), storeOrder.getStatus(), storeOrder.getUcouponId(), storeOrder.getStoreCouponId(), storeOrder.getPayType(), storeOrder.getDeviceFrom(),
-                    storeOrder.getSource(), storeOrder.getVersion(), storeOrder.getIsMember(), storeOrder.getOrderType(), storeOrder.getWriteOffCode(), storeOrder.getPayCountdownMinute(), storeOrder.getIpAddress(), storeOrder.getMarketId(), storeOrder.getMarketType(), storeOrder.getCreatedAt(), ""
+                    storeOrder.getSource(), storeOrder.getVersion(), storeOrder.getIsMember(), storeOrder.getOrderType(), storeOrder.getWriteOffCode(), storeOrder.getPayCountdownMinute(), storeOrder.getIpAddress(), storeOrder.getMarketId(), storeOrder.getMarketType(), storeOrder.getCreatedAt(), mixId,masterCode
             });
             GoblinOrderAttr orderAttr = preParam.getOrderAttr();
             sqlDataAttr.add(new Object[]{
@@ -621,7 +621,7 @@ public class MixOrderServiceImpl implements IMixOrderService {
             storeOrder.setUpdatedAt(now);
             sqls.add(SqlMapping.get("goblin_order.pay.order"));
             sqlDataOrder.add(new Object[]{
-                    storeOrder.getPaymentType(), storeOrder.getPaymentId(), storeOrder.getPayCode(), storeOrder.getPayTime(), storeOrder.getWriteOffCode(), storeOrder.getZhengzaiStatus(),storeOrder.getStatus(), storeOrder.getUpdatedAt(),
+                    storeOrder.getPaymentType(), storeOrder.getPaymentId(), storeOrder.getPayCode(), storeOrder.getPayTime(), storeOrder.getWriteOffCode(), storeOrder.getZhengzaiStatus(), storeOrder.getStatus(), storeOrder.getUpdatedAt(), null,
                     orderId, now, now
             });
             sqls.add(SqlMapping.get("goblin_order.pay.sku"));
@@ -658,7 +658,7 @@ public class MixOrderServiceImpl implements IMixOrderService {
 
                 //mysql
                 sqlDataSku.add(new Object[]{
-                        GoblinStatusConst.Status.ORDER_STATUS_2.getValue(), now,
+                        GoblinStatusConst.Status.ORDER_STATUS_2.getValue(), now, orderSkuVo.getStatus() == 4 ? now : null,
                         orderSkuVo.getOrderSkuId(), now, now
                 });
             }

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

@@ -30,14 +30,14 @@ kylin_order_refund_entities.overtimeRefund=INSERT INTO kylin_order_refund_entiti
 
 
 #-------- \u5546\u57CE -------
-goblin.order.create.order_insert=INSERT INTO goblin_store_order (`master_order_code`,`order_id`,`store_id`,`store_name`,`order_code`,`user_id`,`user_name`,`user_mobile`,`price_total`,`pay_code`,`price_actual`,`price_refund`,`price_express`,`price_coupon`,`store_price_coupon`,`price_voucher`,`status`,`ucoupon_id`,`store_coupon_id`,`pay_type`,`device_from`,`source`,`version`,`is_member`,`order_type`,`write_off_code`,`pay_countdown_minute`,`ip_address`,`market_id`,`market_type`,`created_at`,`mix_id`) VALUES (?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?)
+goblin.order.create.order_insert=INSERT INTO goblin_store_order (`master_order_code`,`order_id`,`store_id`,`store_name`,`order_code`,`user_id`,`user_name`,`user_mobile`,`price_total`,`pay_code`,`price_actual`,`price_refund`,`price_express`,`price_coupon`,`store_price_coupon`,`price_voucher`,`status`,`ucoupon_id`,`store_coupon_id`,`pay_type`,`device_from`,`source`,`version`,`is_member`,`order_type`,`write_off_code`,`pay_countdown_minute`,`ip_address`,`market_id`,`market_type`,`created_at`,`mix_id`,`mix_code`) VALUES (?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?)
 goblin.order.create.attr_insert=INSERT INTO goblin_order_attr (`order_attr_id`,`order_id`,`express_contacts`,`express_address`,`express_address_detail`,`express_phone`,`express_type`,`created_at`) VALUES (?,?,?,?,?,?,?,?)
 goblin.order.create.sku_insert=INSERT INTO goblin_order_sku (`order_sku_id`,`order_id`,`spu_id`,`spu_name`,`spu_pic`,`sku_id`,`num`,`sku_price`,`sku_price_actual`,`sku_name`,`sku_no`,`sku_image`,`sku_specs`,`price_voucher`,`created_at`) VALUES (?,?,?,?,?,?,?,?,?,?,?,?,?,?,?)
 #----                   \u518D\u6B21\u652F\u4ED8
 goblin_order.pay.again=UPDATE goblin_store_order SET pay_type = ? ,device_from = ? ,pay_code = ? WHERE order_id = ? and (updated_at <= ? or created_at = ? or updated_at is null)
 #----                   \u8BA2\u5355\u521B\u5EFA&\u652F\u4ED8
-goblin_order.pay.order=UPDATE goblin_store_order SET payment_type = ? ,payment_id=?,pay_code = ? ,pay_time = ?,write_off_code = ? ,zhengzai_status =?,status = ? ,updated_at = ? WHERE order_id = ? and (updated_at <= ? or created_at = ? or updated_at is null)
-goblin_order.pay.sku=UPDATE goblin_order_sku SET status = ? ,updated_at = ?  WHERE order_sku_id = ? and (updated_at <= ? or created_at = ? or updated_at is null)
+goblin_order.pay.order=UPDATE goblin_store_order SET payment_type = ? ,payment_id=?,pay_code = ? ,pay_time = ?,write_off_code = ? ,zhengzai_status =?,status = ? ,updated_at = ?,push_time = ? WHERE order_id = ? and (updated_at <= ? or created_at = ? or updated_at is null)
+goblin_order.pay.sku=UPDATE goblin_order_sku SET status = ? ,updated_at = ? ,push_time = ? WHERE order_sku_id = ? and (updated_at <= ? or created_at = ? or updated_at is null)
 goblin_order.store.refundPrice=UPDATE goblin_store_order SET price_refund = ? ,status = ? , updated_at = ? WHERE order_id = ? and (updated_at <= ? or created_at = ? or updated_at is null)
 goblin_order.store.refundSkuPrice=UPDATE goblin_order_sku SET price_refund = ? ,status = ? ,  updated_at = ? WHERE order_sku_id = ? and (updated_at <= ? or created_at = ? or updated_at is null)
 goblin_order.store.refundBackOrder=UPDATE goblin_back_order SET status = ? ,refund_at=?, updated_at = ? WHERE back_order_id = ? and (updated_at <= ? or created_at = ? or updated_at is null)
@@ -47,7 +47,7 @@ goblin_order.store.refundLog=INSERT INTO goblin_back_order_log (`back_order_log_
 goblin_order.store.backOrder=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`,`status`,`created_at`,`audit_at`,`error_reason`) VALUES (?,?,?,?,?,?,?,?,?,?,?,?,?,?,?)
 
 #-------- NFT -------
-goblin_nft_order.insert=INSERT INTO goblin_nft_order (`order_id`,`spu_id`,`sku_id`,`box_sku_id`,`num`,`store_id`,`store_name`,`order_code`,`user_id`,`user_name`,`user_mobile`,`price_total`,`price_coupon`,`store_price_coupon`,`price_red_envelope`,`price_voucher`,`price_actual`,`ucoupon_id`,`store_coupon_id`,`red_envelope_code`,`status`,`source`,`order_type`,`pay_type`,`device_from`,`version`,`pay_countdown_minute`,`ip_address`,`created_at`,`pay_code`,sku_title,list_id,ex_code,mix_id) VALUES (?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?)
+goblin_nft_order.insert=INSERT INTO goblin_nft_order (`order_id`,`spu_id`,`sku_id`,`box_sku_id`,`num`,`store_id`,`store_name`,`order_code`,`user_id`,`user_name`,`user_mobile`,`price_total`,`price_coupon`,`store_price_coupon`,`price_red_envelope`,`price_voucher`,`price_actual`,`ucoupon_id`,`store_coupon_id`,`red_envelope_code`,`status`,`source`,`order_type`,`pay_type`,`device_from`,`version`,`pay_countdown_minute`,`ip_address`,`created_at`,`pay_code`,sku_title,list_id,ex_code,mix_id,`mix_code`) VALUES (?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?)
 goblin_nft_order.update.pay=UPDATE goblin_nft_order SET payment_type = ?, payment_id=?, pay_code = ?, pay_time = ?, status = ?, updated_at = ? WHERE order_id = ? and (updated_at <= ? or created_at = ? or updated_at is null)
 goblin_nft_order.update.refund=UPDATE goblin_nft_order SET status = ?, updated_at = ? WHERE order_id = ? and (updated_at <= ? or created_at = ? or updated_at is null)
 goblin_nft_order_refund.insert=INSERT INTO goblin_nft_order_refund (`order_refund_id`,`refund_code`,`order_id`,`order_code`,`store_id`,`user_id`,`price`,`status`,`error_reason`,`created_at`) VALUES (?,?,?,?,?,?,?,?,?,?)

liquidnet-bus-service/liquidnet-service-slime/liquidnet-service-slime-impl/src/main/java/com/liquidnet/service/slime/service/impl/SlimeStationService.java

@@ -232,9 +232,11 @@ public class SlimeStationService {
      * @return SlimeStationCheckRefreshVo
      */
     public SlimeStationCheckRefreshVo downloadRefreshTicketData(SlimeAuthorizationPerformanceVo authorizationPerformanceVo, String performanceId, String latestUpdateAt) {
-        Criteria criteria = Criteria.where("performanceId").is(performanceId).and("isPayment").is(1);
+        Criteria criteria = Criteria.where("performanceId").is(performanceId);
         if (StringUtils.isNotEmpty(latestUpdateAt)) {
-            criteria.and("updatedAt").gte(latestUpdateAt);
+            criteria.and("updatedAt").gte(latestUpdateAt).and("isPayment").in(1, 2, 3);
+        } else {
+            criteria.and("isPayment").is(1);
         }
         // 查取演出对应的订单票明细
         Query orderTicketEntitiesVoQuery = Query.query(criteria);

liquidnet-bus-service/liquidnet-service-smile/liquidnet-service-smile-impl/src/main/java/com/liquidnet/service/service/impl/SmileVolunteerServerImpl.java

@@ -2,6 +2,7 @@ package com.liquidnet.service.service.impl;
 
 import com.liquidnet.commons.lang.util.CollectionUtil;
 import com.liquidnet.commons.lang.util.CurrentUtil;
+import com.liquidnet.commons.lang.util.IDCard;
 import com.liquidnet.service.base.ResponseDto;
 import com.liquidnet.service.base.SqlMapping;
 import com.liquidnet.service.base.constant.MQConst;
@@ -110,6 +111,10 @@ public class SmileVolunteerServerImpl implements SmileVolunteersService {
             if (smileRedisUtils.getProjectIdCard(param.getProjectId(), param.getIdCard()) != null) {
                 return ResponseDto.failure("该证件已经报名");
             }
+            int age = IDCard.getAgeByIdCard(param.getIdCard());
+            if (age < 18) {
+                return ResponseDto.failure("招募对象为年满18岁的成年公民");
+            }
 
             if (!utils.validate(param.getName(), param.getIdCard())) {
                 return ResponseDto.failure("验证身份证失败！");

liquidnet-bus-service/liquidnet-service-sweet/src/main/java/com/liquidnet/service/sweet/service/impl/SweetPerformanceServiceImpl.java

@@ -60,6 +60,7 @@ public class SweetPerformanceServiceImpl extends ServiceImpl<SweetPerformanceMap
             show.setPicTwo(picTwo);
             show.setArUrl(arUrl);
             show.setArName(arName);
+            show.setStatus(0);
             show.setOfflineUrl(offlineUrl);
             show.setFileSize(fileSize);
             show.setTimeStart(LocalDateTime.parse(timeStart,DTF_YMD_HMS));