Merge branch 'master' into dev-smile

# 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-candy-api/src/main/java/com/liquidnet/service/candy/service/ICandyCouponService.java

@@ -48,5 +48,5 @@ public interface ICandyCouponService {
 
     ResponseDto<CandyCouponVo> receiveCouponDetails(String ccode);
 
-    ResponseDto<List<CandyCouponVo>> couponListById(String uCouponIds);
+    ResponseDto<List<CandyCouponVo>> couponListById(String uCouponIds,String uid);
 }

liquidnet-bus-api/liquidnet-service-candy-api/src/main/java/com/liquidnet/service/candy/vo/CandyUseResultVo.java

@@ -17,6 +17,10 @@ public class CandyUseResultVo implements Serializable, Cloneable {
     private BigDecimal value;
     @ApiModelProperty(value = "券类型[-1-不可用 | 1-代金券｜2-满减券｜3-兑换券｜4-折扣券|101-优先券]",example = "1")
     private Integer couType;
+    @ApiModelProperty(value = "目标数组")
+    private List<String> targetIds;
+    @ApiModelProperty(value = "满减金额[满多少]")
+    private BigDecimal fullValue;
 
     private static final CandyUseResultVo obj = new CandyUseResultVo();
 

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

@@ -6,6 +6,7 @@ import lombok.Data;
 
 import java.io.Serializable;
 import java.math.BigDecimal;
+import java.util.List;
 
 @Data
 @ApiModel
@@ -16,6 +17,8 @@ public class GoblinUseResultVo implements Serializable, Cloneable {
     private BigDecimal value;
     @ApiModelProperty(value = "券类型[1-代金券|2-折扣券|3-满减券]", example = "1")
     private String couType;
+    @ApiModelProperty(value = "适用spu范围")
+    private List<String> spuIds;
 
     private static final GoblinUseResultVo obj = new GoblinUseResultVo();
 

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

@@ -9,6 +9,7 @@ import lombok.Data;
 import java.io.Serializable;
 import java.math.BigDecimal;
 import java.time.LocalDateTime;
+import java.util.List;
 
 /**
  * 商城:用户优惠券展示信息（缓存）
@@ -61,6 +62,8 @@ public class GoblinUserCouponVo implements Serializable, Cloneable {
 
     @ApiModelProperty(position = 35, value = "店铺ID")
     private String storeId;
+    @ApiModelProperty(position = 36, value = "spuIds")
+    private List<String> spuIds;
 
 
     /* -------------------------------------------------------------------- */

liquidnet-bus-api/liquidnet-service-goblin-api/src/main/java/com/liquidnet/service/goblin/param/CouponCanUse2Param.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.math.BigDecimal;
+
+@Api
+@Data
+public class CouponCanUse2Param implements Serializable, Cloneable {
+    @ApiModelProperty(dataType = "String", name = "spuId", value = "spuId",example = "1",required = true)
+    @NotNull @NotBlank
+    private String spuId;
+    @ApiModelProperty(dataType = "Number", name = "price", value = "当前spu总价",example = "10",required = true)
+    @NotNull @NotBlank
+    private BigDecimal price;
+
+    private static final CouponCanUse2Param obj = new CouponCanUse2Param();
+
+    public static CouponCanUse2Param getNew() {
+        try {
+            return (CouponCanUse2Param) obj.clone();
+        } catch (CloneNotSupportedException e) {
+            e.printStackTrace();
+        }
+        return new CouponCanUse2Param();
+    }
+
+}

liquidnet-bus-api/liquidnet-service-goblin-api/src/main/java/com/liquidnet/service/goblin/param/CouponCanUseAllParam.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 CouponCanUseAllParam implements Serializable, Cloneable {
+    @ApiModelProperty(name = "spuIds", value = "spuId集合",required = true)
+    @NotNull @NotBlank
+    private List<String> spuIds;
+    @ApiModelProperty(dataType = "String", name = "uid", value = "用户id",example = "10",required = true)
+    private String uid;
+
+    private static final CouponCanUseAllParam obj = new CouponCanUseAllParam();
+
+    public static CouponCanUseAllParam getNew() {
+        try {
+            return (CouponCanUseAllParam) obj.clone();
+        } catch (CloneNotSupportedException e) {
+            e.printStackTrace();
+        }
+        return new CouponCanUseAllParam();
+    }
+
+}

liquidnet-bus-api/liquidnet-service-goblin-api/src/main/java/com/liquidnet/service/goblin/param/CouponCanUseParam.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 CouponCanUseParam implements Serializable, Cloneable {
+    @ApiModelProperty(name = "param", value = "对象", required = true)
+    @NotNull
+    @NotBlank
+    private List<CouponCanUse2Param> param;
+    @ApiModelProperty(dataType = "String", name = "uid", value = "用户id", example = "10", required = false)
+    private String uid;
+    @ApiModelProperty(dataType = "String", name = "storeId", value = "店铺id", example = "10", required = false)
+    private String storeId;
+
+    private static final CouponCanUseParam obj = new CouponCanUseParam();
+
+    public static CouponCanUseParam getNew() {
+        try {
+            return (CouponCanUseParam) obj.clone();
+        } catch (CloneNotSupportedException e) {
+            e.printStackTrace();
+        }
+        return new CouponCanUseParam();
+    }
+
+}

liquidnet-bus-api/liquidnet-service-goblin-api/src/main/java/com/liquidnet/service/goblin/param/CouponHelpUseParam.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 CouponHelpUseParam implements Serializable, Cloneable {
+    @ApiModelProperty(name = "param", value = "对象", required = true)
+    @NotNull
+    @NotBlank
+    private List<CouponCanUse2Param> param;
+    @ApiModelProperty(dataType = "String", name = "uid", value = "用户id", example = "10", required = false)
+    private String uid;
+    @ApiModelProperty(dataType = "String", name = "ucouponId", value = "店铺券id", required = false)
+    private String ucouponId;
+    @ApiModelProperty(dataType = "String", name = "platformUcouponId", value = "平台券id", required = false)
+    private String platformUcouponId;
+
+    private static final CouponHelpUseParam obj = new CouponHelpUseParam();
+
+    public static CouponHelpUseParam getNew() {
+        try {
+            return (CouponHelpUseParam) obj.clone();
+        } catch (CloneNotSupportedException e) {
+            e.printStackTrace();
+        }
+        return new CouponHelpUseParam();
+    }
+
+}

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

+package com.liquidnet.service.goblin.param;
+
+import com.liquidnet.service.goblin.dto.vo.GoblinUserCouponVo;
+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.math.BigDecimal;
+import java.util.List;
+
+@Api
+@Data
+public class CouponHelpUseVo implements Serializable, Cloneable {
+//    @ApiModelProperty(name = "param", value = "对象")
+//    private List<CouponCanUse2Param> param;
+//    @ApiModelProperty(name = "couponVo", value = "券vo")
+//    private GoblinUserCouponVo couponVo;
+    @ApiModelProperty(dataType = "String", name = "ucouponId", value = "券id", required = true)
+    private String ucouponId;
+    @ApiModelProperty(dataType = "String", name = "platformUcouponId", value = "平台券id", required = true)
+    private String platformUcouponId;
+    @ApiModelProperty(dataType = "number", name = "price", value = "优惠金额", required = true)
+    private BigDecimal price;
+
+    private static final CouponHelpUseVo obj = new CouponHelpUseVo();
+
+    public static CouponHelpUseVo getNew() {
+        try {
+            return (CouponHelpUseVo) obj.clone();
+        } catch (CloneNotSupportedException e) {
+            e.printStackTrace();
+        }
+        return new CouponHelpUseVo();
+    }
+
+}

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

@@ -43,6 +43,9 @@ public class GoblinOrderPreParam implements Cloneable{
     private GoblinStoreOrder storeOrder;
     private GoblinOrderAttr orderAttr;
     private List<GoblinOrderSku> orderSkuList;
+    private List<String> storeSpuIds;
+    private List<String> platformSpuIds;
+
 
     private static final GoblinOrderPreParam obj = new GoblinOrderPreParam();
 

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

@@ -3,7 +3,7 @@ package com.liquidnet.service.goblin.service;
 import com.liquidnet.service.goblin.dto.vo.GoblinStoreCouponVo;
 import com.liquidnet.service.goblin.dto.vo.GoblinUseResultVo;
 import com.liquidnet.service.goblin.dto.vo.GoblinUserCouponVo;
-import com.liquidnet.service.goblin.param.BackCouponParam;
+import com.liquidnet.service.goblin.param.*;
 
 import java.math.BigDecimal;
 import java.util.ArrayList;
@@ -28,9 +28,21 @@ public interface GoblinCouponService {
     //可用券列表 [价格] [spuId逗号隔开] [uid]
     List<GoblinUserCouponVo> useList(BigDecimal totalPrice, String spuId, String uid);
 
+    //可用券列表[可用券列表[返回商品下所有券]]
+    List<GoblinUserCouponVo> useList3(CouponCanUseAllParam param);
+
+    List<GoblinUserCouponVo> useList2(CouponCanUseParam param);
+
     //使用券 [券id] [消费内容] [价格] [spuId逗号隔开]
     GoblinUseResultVo useCoupon(String ucouponId,String content, BigDecimal totalPrice, String spuId, String uid);
 
     //回退券 [list<Data>] [券id ， 用户id]
     Boolean backCoupon(List<BackCouponParam> params);
+
+    /**
+     *  帮前端写选择券逻辑
+     * @param params
+     * @return
+     */
+    CouponHelpUseVo helpUseCoupon(CouponHelpUseParam params);
 }

liquidnet-bus-api/liquidnet-service-kylin-api/src/main/java/com/liquidnet/service/kylin/constant/KylinRedisConst.java

@@ -12,6 +12,7 @@ public class KylinRedisConst {
     public static final String PERFORMANCES_ROADLIST = "kylin:performances:roadShowId:";
     public static final String PERFORMANCES_AGENT_INFO = "kylin:agent:hash:id:";
     public static final String PERFORMANCES_INVENTORY = "kylin:performances_inventory:ticket:id:";
+    public static final String TICKET_PAY_TXT = "kylin:payTxt:ticket:id:";
     public static final String SURPLUS_GENERAL = "surplusGeneral";
     public static final String SURPLUS_EXCHANGE = "surplusExchange";
     public static final String TICKET = "kylin:ticket:id:";

liquidnet-bus-api/liquidnet-service-kylin-api/src/main/java/com/liquidnet/service/kylin/dto/vo/admin/KylinPerformancePayTxtVo.java

+package com.liquidnet.service.kylin.dto.vo.admin;
+
+import com.liquidnet.service.kylin.dao.TicketAgentDao;
+import com.liquidnet.service.kylin.dao.TicketPayTxtDao;
+import io.swagger.annotations.ApiModel;
+import lombok.Data;
+
+import java.util.List;
+
+@ApiModel
+@Data
+public class KylinPerformancePayTxtVo {
+    private String performancesId;
+    private String title;
+    private List<TicketPayTxtDao> tickets;
+}

liquidnet-bus-api/liquidnet-service-kylin-api/src/main/java/com/liquidnet/service/kylin/service/admin/IKylinPerformancesAdminService.java

@@ -6,10 +6,7 @@ import com.liquidnet.service.kylin.dao.*;
 import com.liquidnet.service.kylin.dto.param.PerformanceAdminListParam;
 import com.liquidnet.service.kylin.dto.param.PerformanceMemberAuditParam;
 import com.liquidnet.service.kylin.dto.param.SysDamaiParam;
-import com.liquidnet.service.kylin.dto.vo.admin.KylinPerformanceAgentVo;
-import com.liquidnet.service.kylin.dto.vo.admin.KylinPerformanceDamaiVo;
-import com.liquidnet.service.kylin.dto.vo.admin.PerformanceRefundConfigVo;
-import com.liquidnet.service.kylin.dto.vo.admin.PerformanceTransferConfigVo;
+import com.liquidnet.service.kylin.dto.vo.admin.*;
 import com.liquidnet.service.kylin.dto.vo.partner.KylinPerformanceMisVo;
 import com.liquidnet.service.kylin.entity.KylinOrderImport;
 import com.liquidnet.service.kylin.entity.KylinPerformances;
@@ -188,6 +185,14 @@ public interface IKylinPerformancesAdminService {
      */
     boolean changeTicketAgent(String performancesId,String ticketId, Integer status);
 
+    /**
+     * 修改 当前票种支付文案
+     * @param ticketId 票务id
+     * @param payTxt 支付文案
+     * @return
+     */
+    boolean changeTicketPayTxt(String performancesId,String ticketId, String payTxt);
+
     /**
      * 修改 演出&票种&是否同步到大麦
      * @return
@@ -240,6 +245,8 @@ public interface IKylinPerformancesAdminService {
 
     KylinPerformanceAgentVo getPerformanceAgent(String performancesId);
 
+    KylinPerformancePayTxtVo getPerformancePayTxt(String performancesId);
+
     KylinPerformanceDamaiVo getPerformanceDamai(String performancesId);
 
     List<PerformanceOrderStatisticalDao> getPerformanceOrderStatisticalList(String performancesId);

liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-common/src/main/java/com/liquidnet/client/admin/common/enums/BusinessType.java

@@ -134,4 +134,9 @@ public enum BusinessType
      * 会员订单退款
      */
     MORDER_REFUND,
+
+    /**
+     * 修改
+     */
+    PERFORMANCE_SAVE,
 }

liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-web/src/main/java/com/liquidnet/client/admin/web/controller/zhengzai/kylin/KylinPerformancesController.java

@@ -16,10 +16,7 @@ import com.liquidnet.service.kylin.dao.PerformanceOrderStatisticalDao;
 import com.liquidnet.service.kylin.dto.param.PerformanceAdminListParam;
 import com.liquidnet.service.kylin.dto.param.PerformanceMemberAuditParam;
 import com.liquidnet.service.kylin.dto.param.SysDamaiParam;
-import com.liquidnet.service.kylin.dto.vo.admin.KylinPerformanceAgentVo;
-import com.liquidnet.service.kylin.dto.vo.admin.KylinPerformanceDamaiVo;
-import com.liquidnet.service.kylin.dto.vo.admin.PerformanceRefundConfigVo;
-import com.liquidnet.service.kylin.dto.vo.admin.PerformanceTransferConfigVo;
+import com.liquidnet.service.kylin.dto.vo.admin.*;
 import com.liquidnet.service.kylin.dto.vo.partner.KylinPerformanceMisVo;
 import com.liquidnet.service.kylin.entity.KylinOrderImport;
 import com.liquidnet.service.kylin.service.admin.IKylinPerformancesAdminService;
@@ -87,7 +84,7 @@ public class KylinPerformancesController extends BaseController {
         return prefix + "/details";
     }
 
-    @Log(title = "演出列表", businessType = BusinessType.AUDIT)
+    @Log(title = "演出审核", businessType = BusinessType.AUDIT)
     @PostMapping(value = "/audit")
     //@RequiresPermissions("kylin:performances:view")
     @ResponseBody
@@ -99,11 +96,12 @@ public class KylinPerformancesController extends BaseController {
     //@RequiresPermissions("kylin:performances:view")
     @PostMapping(value = "/isShow")
     @ResponseBody
+    @Log(title = "演出管理：是否显示", businessType = BusinessType.PERFORMANCE_SAVE)
     public AjaxResult setIsShow(String performancesId, Integer isShow) {
         return toAjax(kylinPerformancesService.setIsShow(performancesId, isShow));
     }
 
-    @Log(title = "演出列表", businessType = BusinessType.DETAIL)
+//    @Log(title = "演出列表", businessType = BusinessType.DETAIL)
     //@RequiresPermissions("kylin:performances:view")
     @GetMapping(value = "/memberInfo/{performancesId}")
     public String memberInfo(@PathVariable("performancesId") String performancesId, ModelMap mmap) {
@@ -112,7 +110,7 @@ public class KylinPerformancesController extends BaseController {
         return prefix + "/memberInfo";
     }
 
-    @Log(title = "演出列表", businessType = BusinessType.UPDATE)
+    @Log(title = "演出管理：提交会员信息", businessType = BusinessType.PERFORMANCE_SAVE)
     //@RequiresPermissions("kylin:performances:view")
     @PostMapping(value = "/memberInfo/submit")
     @ResponseBody
@@ -121,7 +119,7 @@ public class KylinPerformancesController extends BaseController {
         return toAjax(result);
     }
 
-    @Log(title = "演出列表-演出数据", businessType = BusinessType.LIST)
+//    @Log(title = "演出列表-演出数据", businessType = BusinessType.LIST)
     //@RequiresPermissions("kylin:performances:view")
     @GetMapping(value = "/performanceStatic/{performancesId}")
     public String performanceStatic(@PathVariable("performancesId") String performancesId, ModelMap mmap) {
@@ -165,14 +163,30 @@ public class KylinPerformancesController extends BaseController {
         return prefix + "/agent";
     }
 
+    @GetMapping(value = "/payTxt/{performancesId}")
+    public String payTxt(@PathVariable("performancesId") String performancesId, ModelMap mmap) {
+        KylinPerformancePayTxtVo result = kylinPerformancesService.getPerformancePayTxt(performancesId);
+        mmap.put("kylinPerformancePayTxtVo", result);
+        return prefix + "/payTxt";
+    }
+
     //@RequiresPermissions("kylin:performances:view")
     @PostMapping(value = "/agent/change")
     @ResponseBody
+    @Log(title = "演出管理：票种代理", businessType = BusinessType.PERFORMANCE_SAVE)
     public AjaxResult changeTicketAgent(@RequestParam("performancesId") String performancesId, @RequestParam("ticketsId") String ticketsId, @RequestParam("status") Integer status) {
         boolean result = kylinPerformancesService.changeTicketAgent(performancesId, ticketsId, status);
         return toAjax(result);
     }
 
+    @PostMapping(value = "/payTxt/change")
+    @ResponseBody
+    @Log(title = "演出管理：支付文案", businessType = BusinessType.PERFORMANCE_SAVE)
+    public AjaxResult changeTicketPayTxt(@RequestParam("performancesId") String performancesId, @RequestParam("ticketsId") String ticketsId, @RequestParam("payTxt") String payTxt) {
+        boolean result = kylinPerformancesService.changeTicketPayTxt(performancesId, ticketsId, payTxt);
+        return toAjax(result);
+    }
+
     //@RequiresPermissions("kylin:performances:view")
     @PostMapping(value = "/damai/change")
     @ResponseBody
@@ -202,6 +216,7 @@ public class KylinPerformancesController extends BaseController {
     //@RequiresPermissions("kylin:performances:view")
     @PostMapping(value = "/refundConfig/change")
     @ResponseBody
+    @Log(title = "演出管理：退款配置", businessType = BusinessType.PERFORMANCE_SAVE)
     public AjaxResult changeRefundConfig(@RequestParam("performancesId") String performancesId,
                                          @RequestParam("isCanRefund") Integer isCanRefund,
                                          @RequestParam("refundOpenTime") String refundOpenTime,
@@ -238,6 +253,7 @@ public class KylinPerformancesController extends BaseController {
 
     @PostMapping(value = "/transferConfig/change")
     @ResponseBody
+    @Log(title = "演出管理：转赠配置", businessType = BusinessType.PERFORMANCE_SAVE)
     public AjaxResult changeTransferConfig(@RequestParam("performancesId") String performancesId,
                                            @RequestParam("isCanTransfer") Integer isCanTransfer,
                                            @RequestParam("transferStartTime") String transferStartTime,

liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-web/src/main/resources/templates/zhengzai/candy/coupon/mgt/add1.html

@@ -204,7 +204,7 @@
         <div style="display: flex;align-items: center;">
             <span class="labelName">发送类型：</span>
             <div class="layui-input-block" style="display: flex">
-                <input type="radio" value="10" class="sendType" name="sendType" checked><span>全体用户</span>
+<!--                <input type="radio" value="10" class="sendType" name="sendType" checked><span>全体用户</span>-->
                 <input type="radio" value="1" class="sendType" name="sendType"><span>会员</span>
                 <input type="radio" value="2" class="sendType" name="sendType"><span>手机号</span>
             </div>

liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-web/src/main/resources/templates/zhengzai/candy/coupon/mgt/add101.html

@@ -200,7 +200,7 @@
         <div style="display: flex;align-items: center;">
             <span class="labelName">发送类型：</span>
             <div class="layui-input-block" style="display: flex">
-                <input type="radio" value="10" class="sendType" name="sendType" checked><span>全体用户</span>
+<!--                <input type="radio" value="10" class="sendType" name="sendType" checked><span>全体用户</span>-->
                 <input type="radio" value="1" class="sendType" name="sendType"><span>会员</span>
                 <input type="radio" value="2" class="sendType" name="sendType"><span>手机号</span>
             </div>

liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-web/src/main/resources/templates/zhengzai/candy/coupon/mgt/add2.html

@@ -207,7 +207,7 @@
         <div style="display: flex;align-items: center;">
             <span class="labelName">发送类型：</span>
             <div class="layui-input-block" style="display: flex">
-                <input type="radio" value="10" class="sendType" name="sendType" checked><span>全体用户</span>
+<!--                <input type="radio" value="10" class="sendType" name="sendType" checked><span>全体用户</span>-->
                 <input type="radio" value="1" class="sendType" name="sendType"><span>会员</span>
                 <input type="radio" value="2" class="sendType" name="sendType"><span>手机号</span>
             </div>

liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-web/src/main/resources/templates/zhengzai/candy/coupon/mgt/add4.html

@@ -197,7 +197,7 @@
         <div style="display: flex;align-items: center;">
             <span class="labelName">发送类型：</span>
             <div class="layui-input-block" style="display: flex">
-                <input type="radio" value="10" class="sendType" name="sendType" checked><span>全体用户</span>
+<!--                <input type="radio" value="10" class="sendType" name="sendType" checked><span>全体用户</span>-->
                 <input type="radio" value="1" class="sendType" name="sendType"><span>会员</span>
                 <input type="radio" value="2" class="sendType" name="sendType"><span>手机号</span>
             </div>

liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-web/src/main/resources/templates/zhengzai/kylin/performances/details.html

@@ -38,6 +38,8 @@
                     </li>
                     <li id="li-tab-8"><a data-toggle="tab" href="#tab-8" aria-expanded="false" onclick="importInfo()">订单导入</a>
                     </li>
+                    <li id="li-tab-9"><a data-toggle="tab" href="#tab-9" aria-expanded="false" onclick="payTxtInfo()">支付文案</a>
+                    </li>
                 </ul>
                 <div class="tab-content">
                     <div id="tab-1" class="tab-pane">
@@ -69,7 +71,7 @@
                                   th:object="${kylinPerformanceMisVo}">
                                 <div>
                                     <h4>场地核进度：</h4>
-                                    <span th:if="*{fieldAuditStatus==0}" >通过</span>
+                                    <span th:if="*{fieldAuditStatus==0}">通过</span>
                                     <span th:if="*{fieldAuditStatus==1}" style="color: red">待审核</span>
                                     <span th:if="*{fieldAuditStatus==2}" style="color: red">拒绝</span>
                                 </div>
@@ -298,6 +300,16 @@
                                     height=800px frameborder=0></iframe>
                         </div>
                     </div>
+                    <div id="tab-9" class="tab-pane">
+                        <div class="panel-body">
+                            <form class="form-horizontal m" th:object="${kylinPerformanceMisVo}">
+                                <input name="title" th:field="*{title}" class="form-control" type="text" readonly>
+                            </form>
+                            <iframe id="pay_txt_iframe" name="order_import_iframe" marginwidth=0 marginheight=0
+                                    width=100%
+                                    height=800px frameborder=0></iframe>
+                        </div>
+                    </div>
                 </div>
             </div>
         </div>
@@ -351,7 +363,12 @@
         document.getElementById("li-tab-8").style.display = "none";
     }
 
-    if (auditStatus == 1 || fieldStatus == 1 || fieldStatus == 2 ||auditStatus == 2) {
+    var payTxt = [[${@permission.hasPermi('kylin:performances:payTxt')}]];
+    if (payTxt == "hidden") {
+        document.getElementById("li-tab-9").style.display = "none";
+    }
+
+    if (auditStatus == 1 || fieldStatus == 1 || fieldStatus == 2 || auditStatus == 2) {
         document.getElementsByName("auditBtn")[0].style.display = "none";
     }
 
@@ -433,6 +450,11 @@
         document.getElementById("order_import_iframe").src = "../orderImport/" + '[[${kylinPerformanceMisVo.performancesId}]]'.replaceAll("\"", "");
     }
 
+    //支付文案
+    function payTxtInfo() {
+        document.getElementById("pay_txt_iframe").src = "../payTxt/" + '[[${kylinPerformanceMisVo.performancesId}]]'.replaceAll("\"", "");
+    }
+
     $("#tab-nav-1").bind("click", function () {
         $("#tab_iframe_1").attr("src", prefix + "/performanceStatic/" + '[[${kylinPerformanceMisVo.performancesId}]]'.replaceAll("\"", ""));
     });

liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-web/src/main/resources/templates/zhengzai/kylin/performances/payTxt.html

+<!DOCTYPE html>
+<html lang="zh" xmlns:th="http://www.thymeleaf.org">
+<head>
+    <th:block th:include="include :: header('支付文案')"/>
+</head>
+<body class="white-bg">
+<div class="wrapper wrapper-content animated fadeInRight ibox-content">
+    <form class="form-horizontal m" id="form-agent-edit" th:object="${kylinPerformancePayTxtVo}">
+        <div class="form-group">
+            <label class="col-sm-3 control-label is-required">performances_id：</label>
+            <div class="col-sm-8">
+                <input name="performancesId" th:field="*{performancesId}" class="form-control" type="text" readonly>
+            </div>
+        </div>
+        <div class="form-group">
+            <label class="col-sm-3 control-label is-required">演出名称：</label>
+            <div class="col-sm-8">
+                <input name="title" th:value="*{title}" class="form-control" type="text" readonly>
+            </div>
+        </div>
+        <div th:each="ticket : ${kylinPerformancePayTxtVo.tickets}">
+            <div class="form-group">
+                <label class="col-sm-3 control-label is-required">票种名称：</label>
+                <div class="col-sm-8">
+                    <input name="title" th:value="${ticket.title}" class="form-control" type="text" readonly>
+                    <input name="ticketsId" th:value="${ticket.ticketsId}" class="form-control" type="hidden" readonly>
+                </div>
+            </div>
+            <div class="form-group">
+                <label class="col-sm-3 control-label is-required">支付文案：</label>
+                <div class="col-sm-8">
+                    <input name="payTxt" th:value="${ticket.payTxt}" class="form-control" type="text" maxlength="16">
+                </div>
+                <button type="button" class="btn btn-w-m btn-success" onclick="submitHandler(this)">
+                    保存
+                </button>
+            </div>
+        </div>
+    </form>
+</div>
+<th:block th:include="include :: footer"/>
+<script th:inline="javascript">
+    var prefix = ctx + "kylin/performances";
+    $("#form-performances-edit").validate({
+        focusCleanup: true
+    });
+
+    function submitHandler(res) {
+        var param = {
+            "performancesId": '[[${kylinPerformancePayTxtVo.performancesId}]]'.replaceAll("\"", ""),
+            "ticketsId": $(res).parent().parent().find("input[name^='ticketsId']").val(),
+            "payTxt": $(res).parent().parent().find("input[name^='payTxt']").val()
+        }
+        $.operate.post(prefix + "/payTxt/change", param, function (res) {
+            location.reload();
+        });
+    }
+
+
+</script>
+</body>
+</html>

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

@@ -71,6 +71,15 @@ public class GoblinFrontCubeServiceImpl extends ServiceImpl<GoblinFrontCubeMappe
             } else {
                 goblinFrontCube.setUpdateTime(LocalDateTime.now());
                 //数据库修改
+                String spuIds="";
+                for(String spuId:goblinFrontCube.getSpuId().split(",")){
+                    if(spuId.equals("")||spuId.equals("undefined")){
+
+                    }else{
+                        spuIds=spuIds.concat(spuId).concat(",");
+                    }
+                }
+                goblinFrontCube.setSpuId(spuIds);
                 goblinFrontCubeMapper.updateById(goblinFrontCube);
             }
         }

liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-zhengzai/src/main/java/com/liquidnet/client/admin/zhengzai/kylin/service/impl/KylinPerformancesAdminServiceImpl.java

@@ -601,6 +601,12 @@ public class KylinPerformancesAdminServiceImpl extends ServiceImpl<KylinPerforma
         }
     }
 
+    @Override
+    public boolean changeTicketPayTxt(String performancesId, String ticketId, String payTxt) {
+        dataUtils.setTicketPayTxt(ticketId, payTxt);
+        return true;
+    }
+
     @Override
     public boolean changeSysDamai(List<SysDamaiParam> params) {
         try {
@@ -746,6 +752,25 @@ public class KylinPerformancesAdminServiceImpl extends ServiceImpl<KylinPerforma
         return vo;
     }
 
+    @Override
+    public KylinPerformancePayTxtVo getPerformancePayTxt(String performancesId) {
+        KylinPerformances performanceData = performancesMapper.selectOne(new UpdateWrapper<KylinPerformances>().eq("performances_id", performancesId));
+        List<TicketAgentDao> ticketData = ticketsMapper.ticketAgent(performancesId);
+        KylinPerformancePayTxtVo vo = new KylinPerformancePayTxtVo();
+        vo.setPerformancesId(performanceData.getPerformancesId());
+        vo.setTitle(performanceData.getTitle());
+        List<TicketPayTxtDao> payTxtDaoList = new ArrayList();
+        for (TicketAgentDao item : ticketData) {
+            TicketPayTxtDao payTxtDao = new TicketPayTxtDao();
+            payTxtDao.setTicketsId(item.getTicketsId());
+            payTxtDao.setTitle(item.getTitle());
+            payTxtDao.setPayTxt(dataUtils.getTicketPayTxt(item.getTicketsId()));
+            payTxtDaoList.add(payTxtDao);
+        }
+        vo.setTickets(payTxtDaoList);
+        return vo;
+    }
+
     public KylinPerformanceDamaiVo getPerformanceDamai(String performancesId) {
         KylinPerformances performanceData = performancesMapper.selectOne(new UpdateWrapper<KylinPerformances>().eq("performances_id", performancesId));
         KylinPerformanceStatus performanceStatusData = performanceStatusMapper.selectOne(new UpdateWrapper<KylinPerformanceStatus>().eq("performance_id", performancesId));

liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-zhengzai/src/main/java/com/liquidnet/client/admin/zhengzai/kylin/utils/DataUtils.java

@@ -373,17 +373,17 @@ public class DataUtils {
     }
 
     // 获取 快递地址
-    public OrderRefundAddress getRefundAddress(){
+    public OrderRefundAddress getRefundAddress() {
         Object obj = redisDataSourceUtil.getRedisKylinUtil().get(KylinRedisConst.ORDER_REFUND_ADDRESS);
-        if(obj==null){
+        if (obj == null) {
             OrderRefundAddress vo = OrderRefundAddress.getNew();
             vo.setName("张三");
             vo.setPhone("010 124412");
             vo.setAddress("北京 北京市朝阳区广渠路3-12");
-            redisDataSourceUtil.getRedisKylinUtil().set(KylinRedisConst.ORDER_REFUND_ADDRESS,vo);
+            redisDataSourceUtil.getRedisKylinUtil().set(KylinRedisConst.ORDER_REFUND_ADDRESS, vo);
             return vo;
-        }else{
-            return (OrderRefundAddress)obj;
+        } else {
+            return (OrderRefundAddress) obj;
         }
     }
 
@@ -444,12 +444,12 @@ public class DataUtils {
     }
 
     //订单信息存redis
-    public void orderSetRedis(String orderCode){
+    public void orderSetRedis(String orderCode) {
         KylinOrderTicketVo orderTicketVo = mongoTemplate.findOne(Query.query(Criteria.where("orderCode").is(orderCode)), KylinOrderTicketVo.class, KylinOrderTicketVo.class.getSimpleName());
         String orderTicketsId = orderTicketVo.getOrderTicketsId();
         List<KylinOrderTicketEntitiesVo> kylinOrderTicketEntitiesVoList = mongoTemplate.find(Query.query(Criteria.where("orderId").is(orderTicketsId)), KylinOrderTicketEntitiesVo.class, KylinOrderTicketEntitiesVo.class.getSimpleName());
         orderTicketVo.setEntitiesVoList(kylinOrderTicketEntitiesVoList);
-        redisDataSourceUtil.getRedisKylinUtil().set(KylinRedisConst.ORDER +orderTicketsId, orderTicketVo);
+        redisDataSourceUtil.getRedisKylinUtil().set(KylinRedisConst.ORDER + orderTicketsId, orderTicketVo);
     }
 
     public void setkylinExpressModules(List<KylinExpressModuleVo> voList) {
@@ -469,7 +469,7 @@ public class DataUtils {
         if (obj != null) {
             return (KylinTicketExpressModuleVo) obj;
         } else {
-            return KylinTicketExpressModuleVo.getNew() ;
+            return KylinTicketExpressModuleVo.getNew();
         }
     }
 
@@ -497,4 +497,18 @@ public class DataUtils {
             return KylinTicketExpressModuleVo.getNew();
         }
     }
+
+    public void setTicketPayTxt(String ticketId, String payTxt) {
+        redisDataSourceUtil.getRedisKylinUtil().set(KylinRedisConst.TICKET_PAY_TXT + ticketId, payTxt);
+    }
+
+    public String getTicketPayTxt(String ticketId) {
+        String rdsKey = KylinRedisConst.TICKET_PAY_TXT.concat(ticketId);
+        Object obj = redisDataSourceUtil.getRedisKylinUtil().get(rdsKey);
+        if(obj==null){
+            return "";
+        }else{
+            return (String) obj;
+        }
+    }
 }

liquidnet-bus-common/liquidnet-common-base/src/main/java/com/liquidnet/commons/lang/util/FilesUtils.java

@@ -27,14 +27,11 @@ public class FilesUtils {
      */
     public static File multipartFileToFile(MultipartFile file) {
         try {
-            File toFile = null;
-            if (!file.equals("") && file.getSize() > 0) {
             InputStream ins = null;
             ins = file.getInputStream();
-                toFile = new File(file.getOriginalFilename());
+            File toFile = new File(file.getOriginalFilename());
             inputStreamToFile(ins, toFile);
             ins.close();
-            }
             return toFile;
         } catch (Exception e) {
             log.error("multipartFileToFileError", e);

liquidnet-bus-do/liquidnet-service-kylin-do/src/main/java/com/liquidnet/service/kylin/dao/TicketPayTxtDao.java

+package com.liquidnet.service.kylin.dao;
+
+import lombok.Data;
+
+@Data
+public class TicketPayTxtDao {
+    private String ticketsId;
+    private String title;
+    private String payTxt;
+}

liquidnet-bus-service/liquidnet-service-adam/liquidnet-service-adam-impl/src/main/java/com/liquidnet/service/adam/controller/AdamRscController.java

@@ -2,6 +2,7 @@ package com.liquidnet.service.adam.controller;
 
 import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
 import com.github.xiaoymin.knife4j.annotations.ApiSupport;
+import com.liquidnet.commons.lang.util.DateUtil;
 import com.liquidnet.service.adam.dto.rsc.AdamChimeUinfoDto;
 import com.liquidnet.service.adam.dto.rsc.AdamChimeUinfoReq;
 import com.liquidnet.service.adam.dto.vo.*;
@@ -26,6 +27,7 @@ import org.springframework.web.bind.annotation.*;
 import javax.validation.constraints.NotBlank;
 import javax.validation.constraints.NotNull;
 import javax.validation.constraints.Pattern;
+import java.time.LocalDateTime;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
@@ -82,6 +84,17 @@ public class AdamRscController {
         return ResponseDto.success(adamRdmService.getUserMemberVoByUid(uid));
     }
 
+    @ApiOperationSupport(order = 22)
+    @ApiOperation(value = "@API:用户创建日期")
+    @GetMapping("inquire/createdAt")
+    public ResponseDto<LocalDateTime> queryCreatedAt(@NotBlank(message = "用户ID不能为空") @RequestParam String uid) {
+        AdamUserInfoVo vo = adamRdmService.getUserInfoVoByUid(uid);
+        if (vo == null) {
+            return ResponseDto.success(LocalDateTime.of(2222, 1, 1, 1, 1, 1, 1));
+        }
+        return ResponseDto.success(vo.getCreateAt());
+    }
+
     @ApiOperationSupport(order = 30)
     @ApiOperation(value = "@API:票务下单所需信息查询", notes = "包括是否会员、收货地址及入场人信息")
     @PostMapping("inquire/of_buy_ticket")
@@ -136,12 +149,12 @@ public class AdamRscController {
     @ApiOperationSupport(order = 40)
     @ApiOperation(value = "@API:社交用户点击喜欢或不喜欢", notes = "发送点击事件计数")
     @PostMapping("inquire/sendMsgToRedis")
-    public ResponseDto<Boolean> sendMsgToRedis(@RequestParam(required = true) String redisKey,@RequestParam(required = true) String jsonParamStr) {
+    public ResponseDto<Boolean> sendMsgToRedis(@RequestParam(required = true) String redisKey, @RequestParam(required = true) String jsonParamStr) {
         if (null == redisKey || null == jsonParamStr || redisKey.isEmpty() || jsonParamStr.isEmpty()) {
             return ResponseDto.failure();
         }
         try {
-            queueUtils.sendMsgByRedis(redisKey,jsonParamStr);
+            queueUtils.sendMsgByRedis(redisKey, jsonParamStr);
         } catch (Exception e) {
             log.error("@API:社交用户点击喜欢或不喜欢计数入队", e);
         }

liquidnet-bus-service/liquidnet-service-candy/liquidnet-service-candy-impl/src/main/java/com/liquidnet/service/candy/controller/CandyCouponController.java

@@ -346,8 +346,11 @@ public class CandyCouponController {
     @ApiImplicitParams({
             @ApiImplicitParam(type = "form", dataType = "String", name = "uCouponIds", value = "券id(逗号隔开的字符串)", required = true),
     })
-    public ResponseDto<List<CandyCouponVo>> couponListById(@RequestParam("uCouponIds") @NotNull @NotBlank String uCouponIds) {
-        return candyCouponService.couponListById(uCouponIds);
+    public ResponseDto<List<CandyCouponVo>> couponListById(@RequestParam("uCouponIds") @NotNull @NotBlank String uCouponIds, @RequestParam(value = "uid", required = false) String uid) {
+        if (uid == null || uid.equals("")) {
+            uid = CurrentUtil.getCurrentUid();
+        }
+        return candyCouponService.couponListById(uCouponIds, uid);
 //        if (result != null) {
 //            return ResponseDto.success(result);
 //        } else {

liquidnet-bus-service/liquidnet-service-candy/liquidnet-service-candy-impl/src/main/java/com/liquidnet/service/candy/util/CouponBaseUtil.java

@@ -252,7 +252,11 @@ public class CouponBaseUtil {
                                          BigDecimal valOver) {
         boolean isTarget = false;
         ArrayList<String> targetIdList = new ArrayList(Arrays.asList(targetId.split(",")));
-        if (targetIdList.contains(busiId)) {//判断id 对应
+        for (String item : targetIdList) {
+            if (item.contains("ZZ")) {
+                item = item.split("ZZ")[0];
+            }
+            if (item.equals(busiId)) {//判断id 对应
                 if (couType.equals(2)) {
                     if (priceTotal.compareTo(valOver) >= 0) {
                         isTarget = true;
@@ -261,6 +265,16 @@ public class CouponBaseUtil {
                     isTarget = true;
                 }
             }
+        }
+//        if (targetIdList.contains(busiId)) {//判断id 对应
+//            if (couType.equals(2)) {
+//                if (priceTotal.compareTo(valOver) >= 0) {
+//                    isTarget = true;
+//                }
+//            } else {
+//                isTarget = true;
+//            }
+//        }
         return isTarget;
     }
 

liquidnet-bus-service/liquidnet-service-candy/liquidnet-service-candy-impl/src/main/java/com/liquidnet/service/candy/util/RedisDataUtils.java

@@ -65,7 +65,7 @@ public class RedisDataUtils {
 
         boolean needSet = false;
         if (userCreateTime == null) {
-            userCreateTime = LocalDateTime.MIN;
+            userCreateTime = LocalDateTime.of(2222,1,1,0,0,0);
         }
         List<String> userIds = userDto.stream().map(CandyUserCouponBasicDto::getCcouponId).collect(Collectors.toList());
         if (userIds!=null && userIds.size() > 0) {

liquidnet-bus-service/liquidnet-service-consumer-all/liquidnet-service-consumer-goblin/src/main/resources/bootstrap-service-consumer-goblin.yml

-#eurekaServer配置
-eureka:
-  client:
-    register-with-eureka: true
-    fetch-registry: true
-    serviceUrl:
-      defaultZone: http://${liquidnet.security.username}:${liquidnet.security.password}@${liquidnet.eureka.host}/eureka-server/eureka
-#configServer配置
-spring:
-  cloud:
-    config:
-#      uri: http://39.107.71.112:7002/support-config
-      profile: ${liquidnet.cloudConfig.profile}
-      name: ${spring.application.name} #默认为spring.application.name
-      discovery:
-        enabled: true
-        service-id: liquidnet-support-config

liquidnet-bus-service/liquidnet-service-dragon/liquidnet-service-dragon-impl/src/main/java/com/liquidnet/service/dragon/controller/PayController.java

@@ -95,10 +95,10 @@ public class PayController {
         dragonPayBaseReqDto.setType(type);
         dragonPayBaseReqDto.setPrice(price);
         dragonPayBaseReqDto.setAuthCode(authCode);
-//        if(StringUtil.isNotNull(name)&&name.length()>=32){
-//            name = name.substring(0,32);
-//        }
-        dragonPayBaseReqDto.setName("正在现场");
+        if(StringUtil.isNotNull(name)&&name.length()>=32){
+            name = name.substring(0,32);
+        }
+        dragonPayBaseReqDto.setName(name);
 //        if(StringUtil.isNotNull(detail)&&detail.length()>=64){
 //            detail = detail.substring(0,64);
 //        }

liquidnet-bus-service/liquidnet-service-dragon/liquidnet-service-dragon-impl/src/main/java/com/liquidnet/service/dragon/service/impl/DragonOrderRefundsServiceImpl.java

@@ -416,6 +416,8 @@ public class DragonOrderRefundsServiceImpl implements IDragonOrderRefundsService
                 parameters.put("appid", PayWepayUtils.getInstance().getAPPLET_APP_ID());
             } else if (paymentType.equalsIgnoreCase(DragonConstant.PayTypeEnum.PAYMENT_TYPE_WAP_WEPAY.getCode())) {
                 parameters.put("appid", PayWepayUtils.getInstance().getWAP_APP_ID());
+            }else if(paymentType.equalsIgnoreCase(DragonConstant.PayTypeEnum.PAYMENT_TYPE_MICROPAY_WEPAY.getCode())){
+                parameters.put("appid", PayWepayUtils.getInstance().getAPP_ID());
             }
             parameters.put("nonce_str", nonceStr);
             parameters.put("out_refund_no", refundCode);

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

@@ -6,7 +6,7 @@ import com.liquidnet.service.base.ResponseDto;
 import com.liquidnet.service.goblin.dto.vo.GoblinStoreCouponVo;
 import com.liquidnet.service.goblin.dto.vo.GoblinUseResultVo;
 import com.liquidnet.service.goblin.dto.vo.GoblinUserCouponVo;
-import com.liquidnet.service.goblin.param.BackCouponParam;
+import com.liquidnet.service.goblin.param.*;
 import com.liquidnet.service.goblin.service.GoblinCouponService;
 import com.liquidnet.service.goblin.util.GoblinRedisUtils;
 import com.liquidnet.service.goblin.util.ObjectUtil;
@@ -181,11 +181,11 @@ public class GoblinCouponController {
         if (uid == null) {
             uid = CurrentUtil.getCurrentUid();
         }
-        return ResponseDto.success(goblinCouponService.canUse(totalPrice, spuId, uid,storeId));
+        return ResponseDto.success(goblinCouponService.canUse(totalPrice, spuId, uid, storeId));
     }
 
     @PostMapping("useList")
-    @ApiOperation("可用券列表")
+    @ApiOperation("可用券列表[不判断部分商品]")
     @ApiResponse(code = 200, message = "接口返回对象参数")
     @ApiImplicitParams({
             @ApiImplicitParam(type = "form", required = true, dataType = "Number", name = "totalPrice", value = "应付价格"),
@@ -201,24 +201,44 @@ public class GoblinCouponController {
         return ResponseDto.success(goblinCouponService.useList(totalPrice, spuId, uid));
     }
 
-    @PostMapping("useCoupon")
-    @ApiOperation("用券")
+    @PostMapping("useList2")
+    @ApiOperation("可用券列表[判断部分商品]")
     @ApiResponse(code = 200, message = "接口返回对象参数")
-    @ApiImplicitParams({
-            @ApiImplicitParam(type = "form", required = true, dataType = "String", name = "ucouponId", value = "券id"),
-            @ApiImplicitParam(type = "form", required = true, dataType = "String", name = "content", value = "消费内容"),
-            @ApiImplicitParam(type = "form", required = true, dataType = "Number", name = "totalPrice", value = "总价格"),
-            @ApiImplicitParam(type = "form", required = true, dataType = "String", name = "spuId", value = "spuId逗号隔开"),
-            @ApiImplicitParam(type = "form", required = true, dataType = "String", name = "uid", value = "uid"),
-    })
-    public ResponseDto<GoblinUseResultVo> checkOrderResult(@RequestParam("ucouponId") @Valid String ucouponId,
-                                                           @RequestParam("content") @Valid String content,
-                                                           @RequestParam("totalPrice") @Valid BigDecimal totalPrice,
-                                                           @RequestParam("spuId") @Valid String spuId,
-                                                           @RequestParam("uid") @Valid String uid) {
-        return ResponseDto.success(goblinCouponService.useCoupon(ucouponId, content, totalPrice, spuId, uid));
+    public ResponseDto<List<GoblinUserCouponVo>> useList2(@RequestBody CouponCanUseParam param) {
+        if (param.getUid() == null) {
+            param.setUid(CurrentUtil.getCurrentUid());
+        }
+        return ResponseDto.success(goblinCouponService.useList2(param));
+    }
+
+    @PostMapping("useList3")
+    @ApiOperation("可用券列表[返回商品下所有券]")
+    @ApiResponse(code = 200, message = "接口返回对象参数")
+    public ResponseDto<List<GoblinUserCouponVo>> useList3(@RequestBody CouponCanUseAllParam param) {
+        if (param.getUid() == null) {
+            param.setUid(CurrentUtil.getCurrentUid());
+        }
+        return ResponseDto.success(goblinCouponService.useList3(param));
     }
 
+//    @PostMapping("useCoupon")
+//    @ApiOperation("用券")
+//    @ApiResponse(code = 200, message = "接口返回对象参数")
+//    @ApiImplicitParams({
+//            @ApiImplicitParam(type = "form", required = true, dataType = "String", name = "ucouponId", value = "券id"),
+//            @ApiImplicitParam(type = "form", required = true, dataType = "String", name = "content", value = "消费内容"),
+//            @ApiImplicitParam(type = "form", required = true, dataType = "Number", name = "totalPrice", value = "总价格"),
+//            @ApiImplicitParam(type = "form", required = true, dataType = "String", name = "spuId", value = "spuId逗号隔开"),
+//            @ApiImplicitParam(type = "form", required = true, dataType = "String", name = "uid", value = "uid"),
+//    })
+//    public ResponseDto<GoblinUseResultVo> checkOrderResult(@RequestParam("ucouponId") @Valid String ucouponId,
+//                                                           @RequestParam("content") @Valid String content,
+//                                                           @RequestParam("totalPrice") @Valid BigDecimal totalPrice,
+//                                                           @RequestParam("spuId") @Valid String spuId,
+//                                                           @RequestParam("uid") @Valid String uid) {
+//        return ResponseDto.success(goblinCouponService.useCoupon(ucouponId, content, totalPrice, spuId, uid));
+//    }
+
     @PostMapping("backCoupon")
     @ApiOperation("退券")
     @ApiResponse(code = 200, message = "接口返回对象参数")
@@ -228,4 +248,18 @@ public class GoblinCouponController {
         }
         return ResponseDto.success(goblinCouponService.backCoupon(backCouponParam));
     }
+
+    @PostMapping("helpUseCoupon")
+    @ApiOperation("帮助用券")
+    @ApiResponse(code = 200, message = "接口返回对象参数")
+    public ResponseDto<CouponHelpUseVo> helpUseCoupon(@RequestBody CouponHelpUseParam param) {
+        if (param.getUid() == null || param.getUid().equals("")) {
+            param.setUid(CurrentUtil.getCurrentUid());
+        }
+        CouponHelpUseVo vo = goblinCouponService.helpUseCoupon(param);
+        if(vo==null){
+            return ResponseDto.failure("券不存在");
+        }
+        return ResponseDto.success(vo);
+    }
 }

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

@@ -29,10 +29,6 @@ import java.util.List;
 @RestController
 @RequestMapping("/front")
 public class GoblinFrontController {
-    @Autowired
-    private RedisUtil redisUtil;
-    @Autowired
-    private GoblinRedisUtils goblinRedisUtils;
     @Autowired
     private GoblinFrontServiceImpl goblinFrontService;
 

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

@@ -631,23 +631,23 @@ public class GoblinFrontServiceImpl implements GoblinFrontService {
         Pageable pageable=null;
         //
         if(type.equals("1")){
-            pageable = PageRequest.of(page, pageSize, Sort.by(Sort.Direction.DESC, "count"));
+            pageable = PageRequest.of(page, pageSize, Sort.by(Sort.Direction.DESC, "count","createdAt"));
         }else if(type.equals("2")){
-             pageable = PageRequest.of(page, pageSize, Sort.by(Sort.Direction.DESC, "shelvesAt"));
+             pageable = PageRequest.of(page, pageSize, Sort.by(Sort.Direction.DESC, "shelvesAt","createdAt"));
         }else if(type.equals("3")){
             Document source = new Document();
             source.put("locale", "zh");
             source.put("numericOrdering", true);
             Collation collation = Collation.from(source);
             query.collation(collation);
-            pageable = PageRequest.of(page, pageSize, Sort.by(Sort.Direction.DESC, "priceGe"));
+            pageable = PageRequest.of(page, pageSize, Sort.by(Sort.Direction.DESC, "priceGe","createdAt"));
         }else if(type.equals("4")){
             Document source = new Document();
             source.put("locale", "zh");
             source.put("numericOrdering", true);
             Collation collation = Collation.from(source);
             query.collation(collation);
-            pageable = PageRequest.of(page, pageSize, Sort.by(Sort.Direction.ASC, "priceGe"));
+            pageable = PageRequest.of(page, pageSize, Sort.by(Sort.Direction.ASC, "priceGe","createdAt"));
         }
         // 排序 分页
        // Query query = Query.query(Criteria.where("status").ne(1).and("status").ne(0));
@@ -853,14 +853,25 @@ public class GoblinFrontServiceImpl implements GoblinFrontService {
                 }
             }
         }else{
-            //查看是否有 配置的 spuid的顺序
+        /*    //查看是否有 配置的 spuid的顺序
             String selectGoodsSpuids= getRedisKey(GoblinRedisConst.SELECT_GOODS_PAGE1);
             if(StringUtil.isBlank(selectGoodsSpuids)){
                 List<GoblinFrontSelectGoods> list= (List<GoblinFrontSelectGoods>) redisUtil.get(GoblinRedisConst.SELECT_GOODS);
                 setPage1AndSpu(list,pageSize);
                 this.getSelectGoods(page,pageSize);
             }
-            String[] spuidss=selectGoodsSpuids.split(",");
+            String[] spuidss=selectGoodsSpuids.split(",");*/
+
+            //查看是否有 配置的 spuid的顺序
+            /*  String selectGoodsSpuids= getRedisKey(GoblinRedisConst.SELECT_GOODS_PAGE1);*/
+            if(!redisUtil.hasKey(GoblinRedisConst.SELECT_GOODS_SPUIDS)){
+                List<GoblinFrontSelectGoods> list= (List<GoblinFrontSelectGoods>) redisUtil.get(GoblinRedisConst.SELECT_GOODS);
+                setPage1AndSpu(list,pageSize);
+                this.getSelectGoods(page,pageSize);
+            }
+            String[] spuidss=redisUtil.get(GoblinRedisConst.SELECT_GOODS_SPUIDS).toString().split(",");
+            //String[] spuidss=selectGoodsSpuids.split(",");
+
             //找到对应的spuid
             int start =page*pageSize;
             int end=(page+1)*pageSize;

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

@@ -557,7 +557,7 @@ public class GoblinOrderAppServiceImpl implements IGoblinOrderAppService {
                         logVo.setOrderCode(orderVo.getOrderCode());
                         logVo.setPayCode(orderVo.getPayCode());
                         logVo.setStoreId(orderVo.getStoreId());
-                        if (orderSkuVo.getSkuId().indexOf(GoblinStatusConst.MarketPreStatus.MARKET_PRE_PURCHASE.getValue()) > 0) {
+                        if (orderSkuVo.getSkuId().indexOf(GoblinStatusConst.MarketPreStatus.MARKET_PRE_ZHENGZAI.getValue()) > 0) {
                             logVo.setOrderType("zhengzai");
                         } else {
                             logVo.setOrderType("order");
@@ -627,7 +627,7 @@ public class GoblinOrderAppServiceImpl implements IGoblinOrderAppService {
         logVo.setOrderId(orderVo.getOrderId());
         logVo.setOrderCode(orderVo.getOrderCode());
         logVo.setPayCode(orderVo.getPayCode());
-        if (orderSkuVo.getSkuId().indexOf(GoblinStatusConst.MarketPreStatus.MARKET_PRE_PURCHASE.getValue()) > 0) {
+        if (orderSkuVo.getSkuId().indexOf(GoblinStatusConst.MarketPreStatus.MARKET_PRE_ZHENGZAI.getValue()) > 0) {
             logVo.setOrderType("zhengzai");
         } else {
             logVo.setOrderType("order");

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

@@ -138,7 +138,7 @@ public class GoblinStoreOrderServiceImpl implements IGoblinStoreOrderService {
         vo.setPayTime(orderVo.getPayTime());
         vo.setPriceExpress(orderVo.getPriceExpress());
         if (!(orderVo.getUcouponId() == null || orderVo.getUcouponId().equals(""))) {
-            CandyCouponVo candyCouponVo = orderUtils.getCouponDetails(orderVo.getUcouponId());
+            CandyCouponVo candyCouponVo = orderUtils.getCouponDetails(orderVo.getUcouponId(),orderVo.getUserId());
             vo.setPlatformUcouponId(candyCouponVo.getUcouponId());
             vo.setPlatformUcouponName(candyCouponVo.getTitle());
             vo.setPlatformUcouponPrice(orderVo.getPriceCoupon());

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

@@ -948,7 +948,7 @@ public class GoblinMongoUtils {
             );
         }
         Query query = Query.query(criteria);
-        query.skip(skipCount).limit(size);
+        query.skip(skipCount).limit(size).with(Sort.by(Sort.Order.desc("createdAt")));
         List<GoblinOrderLogVo> dataList = mongoTemplate.find(query, GoblinOrderLogVo.class, GoblinOrderLogVo.class.getSimpleName());
         //查询总数量
         Query countQuery = Query.query(criteria);

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

@@ -21,6 +21,7 @@ import org.springframework.util.MultiValueMap;
 import java.math.BigDecimal;
 import java.util.ArrayList;
 import java.util.HashMap;
+import java.util.List;
 
 @Component
 @Slf4j
@@ -35,119 +36,6 @@ public class GoblinOrderUtils {
     @Autowired
     GoblinRedisUtils redisUtils;
 
-    public AdamRscPolymer01Vo adamAddressEnterMember(String uid, String enterIds, String addressId) {
-        try {
-            MultiValueMap<String, String> header = CollectionUtil.linkedMultiValueMapStringString();
-            header.add("Accept", "application/json;charset=UTF-8");
-            MultiValueMap<String, String> params = CollectionUtil.linkedMultiValueMapStringString();
-            params.add("addressId", addressId);
-            params.add("entersIds", enterIds);
-            params.add("uid", uid);
-            String resultData = HttpUtil.post(adamUrl + "/adam/rsc/inquire/of_buy_ticket", params, header);
-            ResponseDto<AdamRscPolymer01Vo> vo = JsonUtils.fromJson(resultData, new TypeReference<ResponseDto<AdamRscPolymer01Vo>>() {
-            });
-            if (null != vo.getData()) {
-                return vo.getData();
-            } else {
-                return null;
-            }
-        } catch (Exception e) {
-            log.error("获取用户信息,e:{}", e);
-            e.printStackTrace();
-            return null;
-        }
-    }
-
-    //判断 数量限购
-    public String judgeOrderLimit(String uid, String skuId, int number, int limitCount) {
-        int buyCount = redisUtils.getSkuCountByUid(uid, skuId);
-        if (buyCount + number > limitCount) {
-            return "已超出限购数量";
-        } else {
-            int a = redisUtils.incrSkuCountByUid(uid, skuId, number);
-            return "";
-        }
-    }
-
-    //判断指定人群购买
-    public Boolean judgeOrderRose(Boolean isMember, String skuId, String mobile, int buyFactor) {
-        Boolean result = false;
-        switch (buyFactor) {
-            case 0:
-                result = true;
-                break;
-            case 1:
-                result = isMember;
-                break;
-            case 2:
-                result = redisUtils.getSkuCanBuyByUid(mobile, skuId);
-                break;
-        }
-        return result;
-    }
-
-    /**
-     * 使用优惠券
-     *
-     * @param uCouponId  券id
-     * @param content    消费内容
-     * @param totalPrice 订单总价
-     * @return
-     */
-    public HashMap<String, Object> useCoupon(String uCouponId, String content, BigDecimal totalPrice, String spuId, String uid) {
-        HashMap<String, Object> hashMap = CollectionUtil.mapStringObject();
-        try {
-            MultiValueMap<String, String> params = CollectionUtil.linkedMultiValueMapStringString();
-            params.add("uCouponId", uCouponId);
-            params.add("content", content);
-            params.add("totalPrice", totalPrice.toString());
-            params.add("goodId", spuId);
-            params.add("performanceId", "null");
-            params.add("timeId", "null");
-            params.add("ticketId", "null");
-            params.add("uid", uid);
-            MultiValueMap<String, String> header = CollectionUtil.linkedMultiValueMapStringString();
-            header.add("Authorization", "Bearer " + CurrentUtil.getToken());
-            header.add("Accept", "application/json;charset=UTF-8");
-            log.debug("url=" + candyUrl + "/candy-coupon/use");
-            String returnData = HttpUtil.post(candyUrl + "/candy-coupon/use", params, header);
-            ResponseDto<CandyUseResultVo> innerReturnVo = JsonUtils.fromJson(returnData, new TypeReference<ResponseDto<CandyUseResultVo>>() {
-            });
-            CandyUseResultVo candyUseResultVo = innerReturnVo.getData();
-            Integer type = candyUseResultVo.getCouType();
-            BigDecimal value = candyUseResultVo.getValue();
-            BigDecimal voucher = BigDecimal.ZERO;
-            switch (type) {
-                case -1:
-                    voucher = BigDecimal.valueOf(-1);
-                    break;
-                case 1:
-                    voucher = voucher.add(value);
-                    break;
-                case 2:
-                    voucher = voucher.add(value);
-                    break;
-                case 3:
-                    voucher = voucher.add(totalPrice);
-                    break;
-                case 4:
-                    voucher = totalPrice.subtract(totalPrice.multiply(value));
-                    break;
-                default:
-                    voucher = BigDecimal.ZERO;
-                    break;
-            }
-            hashMap.put("type", type);
-            hashMap.put("voucher", voucher.setScale(2, BigDecimal.ROUND_HALF_UP));
-            return hashMap;
-        } catch (Exception e) {
-            log.error("用券ERROR:{}", e);
-            hashMap.put("type", -1);
-            hashMap.put("voucher", 0);
-            return hashMap;
-        }
-    }
-
     public void backCoupon(String uCouponId, String uid) {
         try {
             BackCouponParam param = BackCouponParam.getNew();
@@ -166,7 +54,7 @@ public class GoblinOrderUtils {
         }
     }
 
-    public CandyCouponVo getCouponDetails(String uCouponId) {
+    public CandyCouponVo getCouponDetails(String uCouponId,String uid) {
         try {
             MultiValueMap<String, String> header = CollectionUtil.linkedMultiValueMapStringString();
             header.add("Authorization", "Bearer " + CurrentUtil.getToken());
@@ -174,10 +62,15 @@ public class GoblinOrderUtils {
 
             MultiValueMap<String, String> params = CollectionUtil.linkedMultiValueMapStringString();
             params.add("uCouponIds", uCouponId);
+            params.add("uid", uid);
             String returnData = HttpUtil.post(candyUrl + " /candy-coupon/receive/ListById", params, header);
-            ResponseDto<CandyCouponVo> innerReturnVo = JsonUtils.fromJson(returnData, new TypeReference<ResponseDto<CandyCouponVo>>() {
+            ResponseDto<List<CandyCouponVo>> innerReturnVo = JsonUtils.fromJson(returnData, new TypeReference<ResponseDto<List<CandyCouponVo>>>() {
             });
-            return innerReturnVo.getData();
+            if(innerReturnVo.getData().size()>0){
+                return innerReturnVo.getData().get(0);
+            }else{
+                return null;
+            }
         } catch (Exception e) {
             log.error("回退券ERROR:{}", e);
             CandyCouponVo vo = CandyCouponVo.getNew();
@@ -201,19 +94,4 @@ public class GoblinOrderUtils {
             e.printStackTrace();
         }
     }
-
-    public void desTask(String uid, BigDecimal price) {
-        try {
-            MultiValueMap<String, String> header = CollectionUtil.linkedMultiValueMapStringString();
-            header.add("Accept", "application/json;charset=UTF-8");
-            MultiValueMap<String, String> params = CollectionUtil.linkedMultiValueMapStringString();
-            params.add("score", price.intValue() + "");
-            params.add("content", "购买商品:");
-            params.add("uid", uid);
-            String resultData = HttpUtil.post(stoneUrl + "/user/logs/de2111", params, header);
-        } catch (Exception e) {
-            log.error("添加积分失败,e:{}", e);
-            e.printStackTrace();
-        }
-    }
 }

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

@@ -22,6 +22,7 @@ import org.springframework.util.StringUtils;
 import java.time.LocalDateTime;
 import java.util.ArrayList;
 import java.util.List;
+import java.util.stream.Collectors;
 
 import static com.liquidnet.service.goblin.constant.GoblinRedisConst.REDIS_GOBLIN_TEMP_COUPON_MARKET;
 
@@ -104,7 +105,7 @@ public class GoblinRedisUtils {
         if (obj == null) {
             return CollectionUtil.arrayListString();
         } else {
-            return (List<String>) obj;
+            return ((List<String>) obj).stream().distinct().collect(Collectors.toList());
         }
     }
 

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

@@ -344,7 +344,7 @@ public class KylinOrderTicketsRefundServiceImpl {
                 if (isCanRefund > 0) {
                     chargesRatio = refundPoundage.get(2).getPresent();
                 } else {
-                    chargesRatio = BigDecimal.valueOf(Long.parseLong("-1"));
+                    chargesRatio = BigDecimal.valueOf(Long.parseLong("1"));
                     // return ResponseDto.failure("当前日期不支持退票");
                 }
             }

liquidnet-bus-service/liquidnet-service-notify/liquidnet-service-notify-impl/src/main/java/com/liquidnet/service/dragon/config/RedisStreamConfig.java

-package com.liquidnet.service.dragon.config;
-
-import org.springframework.context.annotation.Configuration;
-
-@Configuration
-public class RedisStreamConfig {
-
-//    @Autowired
-//    private RedisPayNotifyReceiver redisPayNotifyReceiver;
-
-//    @Bean
-//    public Subscription subscriptionAlipayNotify0(RedisConnectionFactory factory) {
-//        var options = StreamMessageListenerContainer
-//                .StreamMessageListenerContainerOptions
-//                .builder()
-//                .pollTimeout(Duration.ofMillis(1))
-//                .build();
-//        var listenerContainer = StreamMessageListenerContainer.create(factory, options);
-//        var subscription = listenerContainer.receiveAutoAck(Consumer.from(DragonConstant.ChannelRedisQueueEnum.ALIPAY_PAY_GROUP.getCode(), "alipay-pay-notify-0"),
-//                StreamOffset.create(DragonConstant.ChannelRedisQueueEnum.ALIPAY_PAY_KEY.getCode(), ReadOffset.lastConsumed()), redisPayNotifyReceiver);
-//        listenerContainer.start();
-//        return subscription;
-//    }
-//
-//    @Bean
-//    public Subscription subscriptionAlipayNotify1(RedisConnectionFactory factory) {
-//        var options = StreamMessageListenerContainer
-//                .StreamMessageListenerContainerOptions
-//                .builder()
-//                .pollTimeout(Duration.ofMillis(1))
-//                .build();
-//        var listenerContainer = StreamMessageListenerContainer.create(factory, options);
-//        var subscription = listenerContainer.receiveAutoAck(Consumer.from(DragonConstant.ChannelRedisQueueEnum.ALIPAY_PAY_GROUP.getCode(), "alipay-pay-notify-1"),
-//                StreamOffset.create(DragonConstant.ChannelRedisQueueEnum.ALIPAY_PAY_KEY.getCode(), ReadOffset.lastConsumed()), redisPayNotifyReceiver);
-//        listenerContainer.start();
-//        return subscription;
-//    }
-//
-//    @Bean
-//    public Subscription subscriptionWepayNotify0(RedisConnectionFactory factory) {
-//        var options = StreamMessageListenerContainer
-//                .StreamMessageListenerContainerOptions
-//                .builder()
-//                .pollTimeout(Duration.ofMillis(1))
-//                .build();
-//        var listenerContainer = StreamMessageListenerContainer.create(factory, options);
-//        var subscription = listenerContainer.receiveAutoAck(Consumer.from(DragonConstant.ChannelRedisQueueEnum.WECHAT_PAY_GROUP.getCode(), "wepay-pay-notify-0"),
-//                StreamOffset.create(DragonConstant.ChannelRedisQueueEnum.WECHAT_PAY_KEY.getCode(), ReadOffset.lastConsumed()), redisPayNotifyReceiver);
-//        listenerContainer.start();
-//        return subscription;
-//    }
-//
-//    @Bean
-//    public Subscription subscriptionWepayNotify1(RedisConnectionFactory factory) {
-//        var options = StreamMessageListenerContainer
-//                .StreamMessageListenerContainerOptions
-//                .builder()
-//                .pollTimeout(Duration.ofMillis(1))
-//                .build();
-//        var listenerContainer = StreamMessageListenerContainer.create(factory, options);
-//        var subscription = listenerContainer.receiveAutoAck(Consumer.from(DragonConstant.ChannelRedisQueueEnum.WECHAT_PAY_GROUP.getCode(), "wepay-pay-notify-1"),
-//                StreamOffset.create(DragonConstant.ChannelRedisQueueEnum.WECHAT_PAY_KEY.getCode(), ReadOffset.lastConsumed()), redisPayNotifyReceiver);
-//        listenerContainer.start();
-//        return subscription;
-//    }
-}

liquidnet-bus-service/liquidnet-service-notify/liquidnet-service-notify-impl/src/main/java/com/liquidnet/service/dragon/service/impl/DragonOrderRefundsServiceImpl.java

@@ -413,6 +413,8 @@ public class DragonOrderRefundsServiceImpl implements IDragonOrderRefundsService
                 parameters.put("appid", PayWepayUtils.getInstance().getAPPLET_APP_ID());
             } else if (paymentType.equalsIgnoreCase(DragonConstant.PayTypeEnum.PAYMENT_TYPE_WAP_WEPAY.getCode())) {
                 parameters.put("appid", PayWepayUtils.getInstance().getWAP_APP_ID());
+            } else if(paymentType.equalsIgnoreCase(DragonConstant.PayTypeEnum.PAYMENT_TYPE_MICROPAY_WEPAY.getCode())){
+                parameters.put("appid", PayWepayUtils.getInstance().getAPP_ID());
             }
             parameters.put("nonce_str", nonceStr);
             parameters.put("out_refund_no", refundCode);

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

@@ -234,7 +234,7 @@ public class KylinOrderTicketsServiceImpl implements IKylinOrderTicketsOrderServ
                 if (isOldMember) {
 
                 } else {
-                    if (memberType == 1) {
+                    if (DateUtil.compareStrDay(DateUtil.getNowTime(), memberTimeStart) == 1 && DateUtil.compareStrDay(DateUtil.getNowTime(), timeStart) == -1) {
                         advanceMap = orderUtils.useCoupon(payOrderParam.getAdvanceCode(), "购买 " + performanceData.getTitle(), BigDecimal.ZERO, payOrderParam.getPerformanceId(), payOrderParam.getTimeId(), payOrderParam.getTicketId());
                         if (advanceMap == null) {
                             return ResponseDto.failure("优先券不可用");
@@ -247,7 +247,7 @@ public class KylinOrderTicketsServiceImpl implements IKylinOrderTicketsOrderServ
                 }
             }
 
-            if (isMember || advanceMap != null) {
+            if ((isOldMember && memberType == 1) || advanceMap != null) {
                 if (DateUtil.compareStrDay(DateUtil.getNowTime(), memberTimeStart) == -1) {
                     orderUtils.backAdvanceCoupon(payOrderParam.getAdvanceCode(), uid);
                     return ResponseDto.failure(ErrorMapping.get("20011"));//未开始
@@ -321,16 +321,20 @@ public class KylinOrderTicketsServiceImpl implements IKylinOrderTicketsOrderServ
                 //限购判断 如果实名 则身份证维度限购 如果不实名则数量限购
                 if (entersVoList.size() > 0) {
                     for (int i = 0; i < entersVoList.size(); i++) {
+                        dataUtils.changeBuyInfo(uid, entersVoList.get(i).getIdCard(), performanceData.getPerformancesId(), ticketData.getTicketsId(), 1);
                         String res1 = orderUtils.judgeOrderLimit(performanceData.getType(), uid, entersVoList.get(i).getIdCard(), payOrderParam.getPerformanceId(), payOrderParam.getTicketId(), performanceLimit, performanceMemberLimit, ticketLimit, ticketMemberLimit, 1, 1, memberType, isTrueName);
                         if (!res1.equals("")) {
+                            dataUtils.changeBuyInfo(uid, entersVoList.get(i).getIdCard(), performanceData.getPerformancesId(), ticketData.getTicketsId(), -1);
                             orderUtils.changeSurplus(isPay, payOrderParam.getTicketId(), payOrderParam.getNumber());
                             orderUtils.backAdvanceCoupon(payOrderParam.getAdvanceCode(), uid);
                             return ResponseDto.failure(res1);//乱七八糟异常
                         }
                     }
                 } else {
+                    dataUtils.changeBuyInfo(uid, "", performanceData.getPerformancesId(), ticketData.getTicketsId(), payOrderParam.getNumber());
                     String res1 = orderUtils.judgeOrderLimit(performanceData.getType(), uid, "", payOrderParam.getPerformanceId(), payOrderParam.getTicketId(), performanceLimit, performanceMemberLimit, ticketLimit, ticketMemberLimit, payOrderParam.getNumber(), payOrderParam.getNumber(), memberType, isTrueName);
                     if (!res1.equals("")) {
+                        dataUtils.changeBuyInfo(uid, "", performanceData.getPerformancesId(), ticketData.getTicketsId(), -payOrderParam.getNumber());
                         orderUtils.changeSurplus(isPay, payOrderParam.getTicketId(), payOrderParam.getNumber());
                         orderUtils.backAdvanceCoupon(payOrderParam.getAdvanceCode(), uid);
                         return ResponseDto.failure(res1);//乱七八糟异常
@@ -568,7 +572,7 @@ public class KylinOrderTicketsServiceImpl implements IKylinOrderTicketsOrderServ
                 orderTicketEntitiesVo.setUpdatedAt(null);
                 orderTicketEntitiesVo.setChangeDate(orderTicketEntities.getCreatedAt());
                 mongoTemplate.insert(orderTicketEntitiesVo, KylinOrderTicketEntitiesVo.class.getSimpleName());
-                dataUtils.changeBuyInfo(orderTicketEntitiesVo.getUserId(), orderTicketEntitiesVo.getEnterIdCode(), orderTicketEntitiesVo.getPerformanceId(), orderTicketEntitiesVo.getTicketId(), 1);
+//                dataUtils.changeBuyInfo(orderTicketEntitiesVo.getUserId(), orderTicketEntitiesVo.getEnterIdCode(), orderTicketEntitiesVo.getPerformanceId(), orderTicketEntitiesVo.getTicketId(), 1);
             }
         } else {
             for (int i = 0; i < payOrderParam.getNumber(); i++) {
@@ -602,7 +606,7 @@ public class KylinOrderTicketsServiceImpl implements IKylinOrderTicketsOrderServ
                 orderTicketEntitiesVo.setUpdatedAt(null);
                 orderTicketEntitiesVo.setChangeDate(orderTicketEntities.getCreatedAt());
                 mongoTemplate.insert(orderTicketEntitiesVo, KylinOrderTicketEntitiesVo.class.getSimpleName());
-                dataUtils.changeBuyInfo(orderTicketEntitiesVo.getUserId(), orderTicketEntitiesVo.getEnterIdCode(), orderTicketEntitiesVo.getPerformanceId(), orderTicketEntitiesVo.getTicketId(), 1);
+//                dataUtils.changeBuyInfo(orderTicketEntitiesVo.getUserId(), orderTicketEntitiesVo.getEnterIdCode(), orderTicketEntitiesVo.getPerformanceId(), orderTicketEntitiesVo.getTicketId(), 1);
             }
         }
 
@@ -611,11 +615,15 @@ public class KylinOrderTicketsServiceImpl implements IKylinOrderTicketsOrderServ
         PayResultVo payResultVo;
 
         if (orderTickets.getPriceActual().compareTo(BigDecimal.valueOf(0)) > 0) {
+            String name = dataUtils.getTicketPayTxt(ticketData.getTicketsId());
+            if (name.equals("")) {
+                name = "正在现场";
+            }
             // 调用支付
             LinkedMultiValueMap<String, String> httpData = ObjectUtil.cloneLinkedMultiValueMapStringAndString();
             httpData.add("type", "TICKET");
             httpData.add("price", orderTickets.getPriceActual().toString());
-            httpData.add("name", useTime + ticketData.getTitle() + "-" + performanceData.getTitle());
+            httpData.add("name", name);
             httpData.add("detail", content);
             httpData.add("orderCode", orderTickets.getOrderCode());
             httpData.add("clientIp", CurrentUtil.getCliIpAddr());
@@ -735,10 +743,14 @@ public class KylinOrderTicketsServiceImpl implements IKylinOrderTicketsOrderServ
                 }
                 KylinOrderTicketEntitiesVo entitiesData = orderTicketData.getEntitiesVoList().get(0);
 
+                String name = dataUtils.getTicketPayTxt(orderTicketData.getTicketId());
+                if (name.equals("")) {
+                    name = "正在现场";
+                }
                 LinkedMultiValueMap<String, String> httpData = ObjectUtil.cloneLinkedMultiValueMapStringAndString();
                 httpData.add("type", "TICKET");
                 httpData.add("price", orderTicketData.getPriceActual().toString());
-                httpData.add("name", entitiesData.getUseStart() + "" + entitiesData.getPerformanceTitle());
+                httpData.add("name", name);
                 httpData.add("detail", entitiesData.getPerformanceTitle() + "-" + entitiesData.getTicketTitle() + "-" + entitiesData.getUseStart());
                 httpData.add("orderCode", orderTicketData.getOrderCode());
                 httpData.add("clientIp", CurrentUtil.getCliIpAddr());

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

@@ -316,4 +316,14 @@ public class DataUtils {
         }
         return price;
     }
+
+    public String getTicketPayTxt(String ticketId) {
+        String rdsKey = KylinRedisConst.TICKET_PAY_TXT.concat(ticketId);
+        Object obj = redisUtil.get(rdsKey);
+        if(obj==null){
+            return "";
+        }else{
+            return (String) obj;
+        }
+    }
 }

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

@@ -67,6 +67,8 @@ public class OrderUtils {
         } else {
             integers = roadShowOrderLimit(userId, idCard, performanceId, ticketId, performanceBuyCount, ticketBuyCount, isTrueName);
         }
+        log.debug("演出购买数量="+integers[0]);
+        log.debug("票种购买数量="+integers[1]);
         return judgeMemberType(performanceLimitCount, performanceMemberLimitCount, ticketLimitCount, ticketMemberLimitCount, memberType, integers[0], integers[1], isTrueName);
     }
 
@@ -80,11 +82,11 @@ public class OrderUtils {
             int isTrueName
     ) {
         if (1 == isTrueName) {//实名
-            performanceBuyCount += dataUtils.getIdCardPBuyCount(idCard, performanceId);
-            ticketBuyCount += dataUtils.getIdCardTBuyCount(idCard, ticketId);
+            performanceBuyCount = dataUtils.getIdCardPBuyCount(idCard, performanceId);
+            ticketBuyCount = dataUtils.getIdCardTBuyCount(idCard, ticketId);
         } else {//非实名
-            performanceBuyCount += dataUtils.getUserPBuyCount(userId, performanceId);
-            ticketBuyCount += dataUtils.getUserTBuyCount(userId, ticketId);
+            performanceBuyCount = dataUtils.getUserPBuyCount(userId, performanceId);
+            ticketBuyCount = dataUtils.getUserTBuyCount(userId, ticketId);
         }
         Integer[] array = ObjectUtil.cloneInteger2Array();
         array[0] = performanceBuyCount;
@@ -102,11 +104,11 @@ public class OrderUtils {
             int isTrueName
     ) {
         if (1 == isTrueName) {//实名
-            performanceBuyCount += dataUtils.getIdCardPBuyCount(idCard, performanceId);
-            ticketBuyCount += dataUtils.getIdCardTBuyCount(idCard, ticketId);
+            performanceBuyCount = dataUtils.getIdCardPBuyCount(idCard, performanceId);
+            ticketBuyCount = dataUtils.getIdCardTBuyCount(idCard, ticketId);
         } else {//非实名
-            performanceBuyCount += dataUtils.getUserPBuyCount(userId, performanceId);
-            ticketBuyCount += dataUtils.getUserTBuyCount(userId, ticketId);
+            performanceBuyCount = dataUtils.getUserPBuyCount(userId, performanceId);
+            ticketBuyCount = dataUtils.getUserTBuyCount(userId, ticketId);
         }
 
         Integer[] array = ObjectUtil.cloneInteger2Array();
@@ -116,6 +118,10 @@ public class OrderUtils {
     }
 
     public String judgeMemberType(int performanceLimitCount, int performanceMemberLimitCount, int ticketLimitCount, int ticketMemberLimitCount, int memberType, int performanceBuyCount, int ticketBuyCount, int isTrueName) {
+        log.debug("会员限购演出="+performanceMemberLimitCount);
+        log.debug("限购演出="+performanceLimitCount);
+        log.debug("会员限购票种="+ticketMemberLimitCount);
+        log.debug("限购票种="+ticketLimitCount);
         if (memberType == 1 || memberType == 2) {
             if (performanceBuyCount > performanceMemberLimitCount && performanceMemberLimitCount != 0) {
                 return (1 == isTrueName ? "实名制" : "本场") + "演出限购" + performanceMemberLimitCount + "张，已超出";//超过演出维度购买量

liquidnet-bus-service/liquidnet-service-platform/liquidnet-service-platform-impl/pom.xml

@@ -125,6 +125,11 @@
             <artifactId>liquidnet-api-feign-stone</artifactId>
             <version>1.0-SNAPSHOT</version>
         </dependency>
+        <dependency>
+            <groupId>com.liquidnet</groupId>
+            <artifactId>liquidnet-common-third-shumei</artifactId>
+            <version>1.0-SNAPSHOT</version>
+        </dependency>
     </dependencies>
 
     <build>

liquidnet-bus-service/liquidnet-service-platform/liquidnet-service-platform-impl/src/main/java/com/liquidnet/service/platform/controller/basicServices/AlOssController.java

 package com.liquidnet.service.platform.controller.basicServices;
 
+import com.aliyun.oss.ClientException;
 import com.aliyun.oss.OSS;
 import com.aliyun.oss.OSSClientBuilder;
+import com.aliyun.oss.OSSException;
 import com.aliyun.oss.common.utils.BinaryUtil;
 import com.aliyun.oss.model.GenericResult;
 import com.aliyun.oss.model.ProcessObjectRequest;
 import com.aliyun.oss.model.PutObjectRequest;
 import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.liquidnet.common.third.shumei.util.ShumeiUtil;
 import com.liquidnet.commons.lang.util.DateUtil;
 import com.liquidnet.commons.lang.util.FilesUtils;
 import com.liquidnet.commons.lang.util.IDGenerator;
@@ -19,6 +22,7 @@ import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiImplicitParam;
 import io.swagger.annotations.ApiImplicitParams;
 import io.swagger.annotations.ApiOperation;
+import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
@@ -29,6 +33,7 @@ import org.springframework.web.bind.annotation.RestController;
 import org.springframework.web.multipart.MultipartFile;
 
 import java.io.File;
+import java.io.IOException;
 import java.nio.file.Files;
 import java.nio.file.Path;
 import java.time.LocalDateTime;
@@ -45,6 +50,7 @@ import java.util.UUID;
  * @since 2021-07-09
  */
 @Api(tags = "basicServices")
+@Slf4j
 @RestController
 @RequestMapping("basicServices/alOss")
 public class AlOssController {
@@ -61,6 +67,9 @@ public class AlOssController {
     @Autowired
     private PlatformOssFilesMapper platformOssFilesMapper;
 
+    @Autowired
+    private ShumeiUtil shumeiUtil;
+
     @PostMapping("/upload")
     @ApiOperation("阿里云上传")
     @ApiImplicitParams({
@@ -77,25 +86,35 @@ public class AlOssController {
             @RequestParam(defaultValue = "0", required = false) int resize,
             @RequestParam(defaultValue = "0", required = false) int isCutFrame
     ) {
+        if (file.equals("") || file.getSize() <= 0) {
+            return ResponseDto.failure("不能上传大小为0的文件");
+        }
+
         File fileNew = FilesUtils.multipartFileToFile(file);
         if (null == fileNew) {
-            return ResponseDto.failure("上传失败");
+            return ResponseDto.failure("multipartFileToFile Error");
         }
 
         // 是否上传过 有直接返回
         PlatformOssFiles ossFile = this.getOldOssFile(fileNew);
         UploadVo uploadVo = new UploadVo();
-        if (null == ossFile) {
+        try {
+            if (null == ossFile || (isCutFrame > 0 && ossFile.getVideoImg().isEmpty())) { //保证上传过的文件也能截帧
                 // 上传
                 ossFile = this.uploadOssFile(file, pathName, buckType, resize, fileNew, isCutFrame);
             }
-        BeanUtils.copyProperties(ossFile, uploadVo);
-
+        } finally {
             // 删除临时文件 因为老文件也生成了所以也要删除
             FilesUtils.deleteTempFile(fileNew);
+        }
 
+        if (null == ossFile) {
+            return ResponseDto.failure("上传失败，该文件不合规，请勿上传带有联系方式、色情、涉政、广告等敏感文件");
+        } else {
+            BeanUtils.copyProperties(ossFile, uploadVo);
             return ResponseDto.success(uploadVo);
         }
+    }
 
     /**
      * 获取老的上传文件
@@ -108,6 +127,7 @@ public class AlOssController {
         List<PlatformOssFiles> platformOssFiles = platformOssFilesMapper.selectList(
                 Wrappers.lambdaQuery(PlatformOssFiles.class)
                         .eq(PlatformOssFiles::getMd5str, fileMD5)
+                        .orderByDesc(PlatformOssFiles::getMid)
         );
         if (CollectionUtils.isEmpty(platformOssFiles)) {
             return null;
@@ -128,38 +148,49 @@ public class AlOssController {
      */
     private PlatformOssFiles uploadOssFile(MultipartFile file, String pathName, int buckType, int resize, File fileNew, int isCutFrame) {
         OSS ossClient = new OSSClientBuilder().build(endpoint, accessKeyId, accessKeySecret);
-        String filename = "";
-        String contentType = "";
         int size = 0;
+        String filename, contentType, uploadPath = "";
+        PlatformOssFiles ossFileVideoImg = null;
+        try {
             if (null == file) {
                 filename = fileNew.getName();
                 Path fileNewPath = new File(fileNew.getPath()).toPath();
-            try {
                 contentType = Files.probeContentType(fileNewPath);
-            } catch (Exception e) {
-
-            }
                 size = (int) fileNew.length();
             } else {
                 filename = file.getResource().getFilename();
                 contentType = file.getContentType();
                 size = (int) file.getSize();
             }
-        String uploadPath = FilesUtils.getUploadPath(pathName, filename);
+            uploadPath = FilesUtils.getUploadPath(pathName, filename);
             String bucketName = FilesUtils.getBucketName(buckType);
             PutObjectRequest putObjectRequest = new PutObjectRequest(bucketName, uploadPath, fileNew);
             ossClient.putObject(putObjectRequest);
 
+            if (contentType.contains("image") && !contentType.equals("image/vnd.adobe.photoshop")) {
+                if (!shumeiUtil.checkImage(IDGenerator.nextSnowId(), imgUrl.concat(uploadPath))) {
+                    ossClient.deleteObject(bucketName, uploadPath);
+                    return null;
+                }
+            }
+
             if (resize > 0) { // 裁切
                 this.ossFileResize(resize, uploadPath, bucketName, ossClient);
             }
 
-        PlatformOssFiles ossFileVideoImg = null;
-        if (isCutFrame > 0) { // 截取帧数
+            if (isCutFrame > 0 && contentType.contains("video")) { // 截取帧数
                 ossFileVideoImg = this.ossFileCutFrame(uploadPath, pathName, buckType);
             }
 
             ossClient.shutdown();
+        } catch (OSSException | ClientException | IOException e) {
+            log.error("alOssUploadEx [e:{}]", e);
+            return null;
+        } finally {
+            if (ossClient != null) {
+                ossClient.shutdown();
+            }
+        }
 
         // 入库
         PlatformOssFiles platformOssFilesDate = new PlatformOssFiles();

liquidnet-bus-service/liquidnet-service-platform/liquidnet-service-platform-impl/src/main/java/com/liquidnet/service/platform/controller/goblin/task/PlatformGoblinGoodsTaskController.java

@@ -40,7 +40,8 @@ public class PlatformGoblinGoodsTaskController {
         queryWrapper.eq(GoblinGoods::getSpuAppear, "0");
         queryWrapper.eq(GoblinGoods::getShelvesHandle, "3");
         queryWrapper.le(GoblinGoods::getShelvesTime, now);
-        queryWrapper.eq(GoblinGoods::getShelvesStatus, "0");
+//        queryWrapper.eq(GoblinGoods::getShelvesStatus, "0");
+        queryWrapper.in(GoblinGoods::getShelvesStatus, "0", "1");
         queryWrapper.orderByAsc(GoblinGoods::getShelvesTime);
         queryWrapper.select(GoblinGoods::getSpuId);
 

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

@@ -420,7 +420,7 @@ public class KylinPerformancesPartnerServiceImpl implements IKylinPerformancesPa
                                 ticketData.setTimeEndExpress(ticketItem.getTimeEndExpress());
                                 ticketData.setPrice(ticketItem.getPrice());
                                 ticketData.setMemberPrice(ticketItem.getPrice());
-                                ticketData.setMemberTimeStart(DateUtil.Formatter.yyyyMMddHHmmss.format(DateUtil.Formatter.yyyyMMddHHmmss.parse(ticketItem.getTimeStart()).minusMinutes(kylinPerformanceMisVo.getPayCountdownMinute())));
+                                ticketData.setMemberTimeStart(DateUtil.Formatter.yyyyMMddHHmmss.format(DateUtil.Formatter.yyyyMMddHHmmss.parse(ticketItem.getTimeStart()).minusMinutes(ticketData.getAdvanceMinuteMember())));
                                 ticketData.setTotalExchange(ticketItem.getTotalExchange());
                                 ticketData.setTotalGeneral(ticketItem.getTotalGeneral());
                                 ticketData.setIsTrueName(kylinPerformanceMisVo.getIsTrueName());