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

liquidnet-bus-api/liquidnet-service-kylin-api/src/main/java/com/liquidnet/service/kylin/dto/vo/mongo/KylinOrderTicketEntitiesVo.java

@@ -48,6 +48,10 @@ public class KylinOrderTicketEntitiesVo implements Serializable, Cloneable {
 
     private LocalDateTime changeDate;
 
+    public BigDecimal getRefundPrice() {
+        return refundPrice==null?BigDecimal.valueOf(0.00):refundPrice;
+    }
+
     private static final KylinOrderTicketEntitiesVo obj = new KylinOrderTicketEntitiesVo();
 
     public static KylinOrderTicketEntitiesVo getNew() {

liquidnet-bus-api/liquidnet-service-kylin-api/src/main/java/com/liquidnet/service/kylin/dto/vo/mongo/KylinOrderTicketVo.java

 package com.liquidnet.service.kylin.dto.vo.mongo;
 
+import com.liquidnet.service.kylin.dto.vo.returns.OrderRefundListVo;
 import com.liquidnet.service.kylin.entity.KylinOrderTicketRelations;
 import com.liquidnet.service.kylin.entity.KylinOrderTicketStatus;
 import com.liquidnet.service.kylin.entity.KylinOrderTickets;
@@ -100,7 +101,7 @@ public class KylinOrderTicketVo implements Serializable {
     private String updatedAt;
 
 //    private Integer isCanRefund;
-    private Integer isHaveRefundDetails;
+    private List<OrderRefundListVo> orderRefundListVos;
 
     private LocalDateTime changeDate;
 

liquidnet-bus-api/liquidnet-service-kylin-api/src/main/java/com/liquidnet/service/kylin/dto/vo/returns/KylinOrderTicketEntitiesPreRefundVo.java

+package com.liquidnet.service.kylin.dto.vo.returns;
+
+import lombok.Data;
+
+import java.io.Serializable;
+import java.math.BigDecimal;
+import java.time.LocalDateTime;
+
+@Data
+public class KylinOrderTicketEntitiesPreRefundVo implements Serializable, Cloneable {
+    private static final long serialVersionUID = 1207664465164005975L;
+    private String orderTicketEntitiesId;
+    private Integer enterType;
+    private String enterName;
+    private String enterMobile;
+    private String enterIdCode;
+    private Integer status;
+    private String useStart;
+    private String useEnd;
+    private BigDecimal refundPrice;
+    private BigDecimal priceActual;
+    private BigDecimal priceCanRefund;
+    private String ticketTitle;
+}

liquidnet-bus-api/liquidnet-service-kylin-api/src/main/java/com/liquidnet/service/kylin/dto/vo/returns/KylinOrderTicketPreVo.java

+package com.liquidnet.service.kylin.dto.vo.returns;
+
+import com.liquidnet.service.kylin.dto.vo.mongo.KylinOrderTicketEntitiesVo;
+import com.liquidnet.service.kylin.entity.KylinOrderTicketRelations;
+import com.liquidnet.service.kylin.entity.KylinOrderTicketStatus;
+import com.liquidnet.service.kylin.entity.KylinOrderTickets;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import org.springframework.beans.BeanUtils;
+
+import java.io.Serializable;
+import java.math.BigDecimal;
+import java.time.LocalDateTime;
+import java.util.List;
+
+@ApiModel(value = "KylinOrderTicketVo", description = "订单数据")
+@Data
+public class KylinOrderTicketPreVo implements Serializable {
+    private Integer mid;
+    private static final long serialVersionUID = 5325511589667456213L;
+    @ApiModelProperty(position = 10, value = "ID")
+    private String orderTicketsId;
+    @ApiModelProperty(position = 11, value = "用户ID[64]")
+    private String userId;
+    @ApiModelProperty(position = 12, value = "用户昵称")
+    private String userName;
+    @ApiModelProperty(position = 13, value = "用户手机号")
+    private String userMobile;
+    @ApiModelProperty(position = 14, value = "演出名称")
+    private String performanceTitle;
+    private String ticketTitle;
+    private String timeStart;
+    private String useStart;
+    private String performanceImg;
+    private Integer number;
+    private BigDecimal priceTotal;
+    private BigDecimal priceVoucher;
+    private BigDecimal priceActual;
+    private BigDecimal priceExpress;
+    private BigDecimal priceRefund;
+    private Integer refundNumber;
+    private String couponType;
+    private String getTicketType;
+
+    private Integer expressType;
+    private Integer status;
+    private String performanceId;
+    private String timeId;
+    private String ticketId;
+    private String fieldName;
+    private Integer isTrueName;
+    private List<KylinOrderTicketEntitiesPreRefundVo> entitiesPreRefundVos;
+}

liquidnet-bus-api/liquidnet-service-kylin-api/src/main/java/com/liquidnet/service/kylin/dto/vo/returns/OrderRefundListVo.java

+package com.liquidnet.service.kylin.dto.vo.returns;
+
+import lombok.Data;
+
+@Data
+public class OrderRefundListVo {
+    private String orderRefundsId;
+    private String orderRefundCode;
+    private Integer status;
+}

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

@@ -6,10 +6,7 @@ import com.liquidnet.service.base.ResponseDto;
 import com.liquidnet.service.kylin.dto.param.PayAgainParam;
 import com.liquidnet.service.kylin.dto.param.PayOrderParam;
 import com.liquidnet.service.kylin.dto.param.SyncOrderParam;
-import com.liquidnet.service.kylin.dto.vo.returns.KylinOrderListVo;
-import com.liquidnet.service.kylin.dto.vo.returns.OrderDetailsVo;
-import com.liquidnet.service.kylin.dto.vo.returns.OrderRefundVo;
-import com.liquidnet.service.kylin.dto.vo.returns.PayResultVo;
+import com.liquidnet.service.kylin.dto.vo.returns.*;
 import com.liquidnet.service.kylin.entity.KylinOrderTickets;
 
 import java.util.ArrayList;
@@ -52,7 +49,7 @@ public interface IKylinOrderTicketsService extends IService<KylinOrderTickets> {
     ResponseDto<Integer> orderUnPayCount();
 
     //想要退款详情
-    OrderDetailsVo toOrderRefundDetails(String orderId);
+    KylinOrderTicketPreVo toOrderRefundDetails(String orderId);
 
     //退款详情
     OrderRefundVo orderRefundDetails(String orderId,String orderRefundId);

liquidnet-bus-common/liquidnet-common-mq/src/main/java/com/liquidnet/common/mq/constant/MQConst.java

@@ -46,6 +46,16 @@ public class MQConst {
     public static final String ROUTING_KEY_SQL_ORDER_PAY = "order.pay";
     public static final String QUEUES_SQL_ORDER_PAY = "queue.sql.order.pay";
 
+    //订单申请退款
+    public static final String EXCHANGES_LIQUIDNET_SQL_ORDER_REFUND = "liquidnet.sql.order.refund";
+    public static final String ROUTING_KEY_SQL_ORDER_REFUND = "order.refund";
+    public static final String QUEUES_SQL_ORDER_REFUND = "queue.sql.order.refund";
+
+    //订单申请撤回
+    public static final String EXCHANGES_LIQUIDNET_SQL_ORDER_WITHDRAW = "liquidnet.sql.order.withdraw";
+    public static final String ROUTING_KEY_SQL_ORDER_WITHDRAW = "order.withdraw";
+    public static final String QUEUES_SQL_ORDER_WITHDRAW = "queue.sql.order.withdraw";
+
     /* -------------------------------------------------------- */
 
     // 验票更新

liquidnet-bus-common/liquidnet-common-web/src/main/java/com/liquidnet/common/web/config/CorsConfig.java

@@ -21,11 +21,13 @@ public class CorsConfig {
         CorsConfiguration corsConfiguration = new CorsConfiguration();
 
         // 可以自行筛选
+        corsConfiguration.addAllowedOrigin("**");
+        corsConfiguration.addAllowedOrigin("https://partner.zhengzai.tv");
+        corsConfiguration.addAllowedOrigin("http://testpartner.zhengzai.tv");
         corsConfiguration.addAllowedOrigin("http://devpartner.zhengzai.tv");
-        corsConfiguration.addAllowedOrigin("http://testm.zhengzai.tv");
-        corsConfiguration.addAllowedOrigin("http://testh5.zhengzai.tv");
         corsConfiguration.addAllowedOrigin("http://m.zhengzai.tv");
-        corsConfiguration.addAllowedOrigin("https://devpartner.zhengzai.tv");
+        corsConfiguration.addAllowedOrigin("http://testm.zhengzai.tv");
+        corsConfiguration.addAllowedOrigin("http://devm.zhengzai.tv");
 
         corsConfiguration.setAllowCredentials(true);
         corsConfiguration.addAllowedHeader("*");

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

@@ -40,14 +40,14 @@ liquidnet:
       url-pay:
         pay: http://testpay.zhengzai.tv
         check: http://testpay.zhengzai.tv/order/verify
-        callback: http://adam.zhengzai.tv/adam/member/order/callback
+        callback: http://testadam.zhengzai.tv/adam/member/order/callback
       url-service:
         url: http://testservice.zhengzai.tv
     kylin:
       url-pay:
         pay: http://testpay.zhengzai.tv/
         check: http://testpay.zhengzai.tv/order/verify
-        localUrl: http://kylin.zhengzai.tv/kylin/order/syncOrder
+        localUrl: http://testkylin.zhengzai.tv/kylin/order/syncOrder
       url-service:
         url: http://testservice.zhengzai.tv/
     executor-main:
@@ -57,7 +57,7 @@ liquidnet:
   client:
     admin:
       phpPayUrl: http://testpay.zhengzai.tv
-      kylinApiUrl: https://kylin.zhengzai.tv
+      kylinApiUrl: https://testkylin.zhengzai.tv
       phpServiceUrl: https://testservice.zhengzai.tv
       phpoMediaApiUrl: https://testmediaapi.zhengzai.tv
       phpMallUrl: https://testmall.zhengzai.tv

liquidnet-bus-config/liquidnet-config/liquidnet-service-adam.yml

@@ -137,6 +137,7 @@ global-auth:
     - ${liquidnet.info.context}/v2/api-docs*
     - ${liquidnet.info.context}/login/*
     - ${liquidnet.info.context}/gen
+    - ${liquidnet.info.context}/ts
     - ${liquidnet.info.context}/send
     - ${liquidnet.info.context}/member/info
     - ${liquidnet.info.context}/member/order/callback

liquidnet-bus-do/liquidnet-service-kylin-do/src/main/resources/com.liquidnet.service.kylin.mapper/KylinCheckUserPerformancesMapper.xml

@@ -36,8 +36,8 @@
         SELECT p.performances_id,
         p.title,
         p.time_start,
-        p.time_end
-        DATE_SUB(p.time_start,INTERVAL -3 DAY) as 'can_dwon_time'
+        p.time_end,
+        DATE_SUB(p.time_start,INTERVAL 3 DAY) as 'can_down_time'
         FROM kylin_performances AS p
         LEFT JOIN kylin_performance_relations AS pr ON pr.performance_id = p.performances_id
         WHERE p.performances_id NOT IN (

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

@@ -14,7 +14,8 @@ import com.liquidnet.commons.lang.util.*;
 import com.liquidnet.service.adam.dto.AdamThirdPartParam;
 import com.liquidnet.service.adam.dto.vo.AdamLoginInfoVo;
 import com.liquidnet.service.adam.dto.vo.AdamUserInfoVo;
-import com.liquidnet.service.adam.service.*;
+import com.liquidnet.service.adam.service.AdamRdmService;
+import com.liquidnet.service.adam.service.IAdamUserService;
 import com.liquidnet.service.base.ErrorMapping;
 import com.liquidnet.service.base.ResponseDto;
 import com.liquidnet.service.base.UserPathDto;
@@ -37,6 +38,8 @@ import javax.validation.Valid;
 import javax.validation.constraints.NotBlank;
 import javax.validation.constraints.Pattern;
 import java.nio.charset.StandardCharsets;
+import java.time.LocalDateTime;
+import java.time.ZoneOffset;
 import java.util.Arrays;
 import java.util.HashMap;
 import java.util.Map;
@@ -270,10 +273,17 @@ public class AdamLoginController {
         return ResponseDto.success();
     }
 
+    @ApiOperationSupport(order = 8)
+    @ApiOperation(value = "时间戳")
+    @GetMapping(value = {"ts"})
+    public ResponseDto<Long> timestamp() {
+        return ResponseDto.success(LocalDateTime.now().toInstant(ZoneOffset.of("+8")).toEpochMilli());
+    }
+
     /* ---------------------------- Internal Method ---------------------------- */
 
     private boolean checkSmsCode(String mobile, String code) {
-        if (Arrays.asList("dev", "test").contains(env.getProperty("spring.profiles.active")) && "111111".equals(code)) {
+        if (Arrays.asList("dev", "test", "prod").contains(env.getProperty("spring.profiles.active")) && "111111".equals(code)) {
             return true;
         }
 

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

@@ -304,7 +304,7 @@ public class AdamUserController {
     private static final String PHP_API_SMS_CODE_VALID = "/smsValidation";
 
     private boolean checkSmsCode(String mobile, String code) {
-        if (Arrays.asList("dev", "test").contains(env.getProperty("spring.profiles.active"))) {
+        if (Arrays.asList("dev", "test", "prod").contains(env.getProperty("spring.profiles.active"))) {
             return "111111".equals(code);
         }
 

liquidnet-bus-service/liquidnet-service-consumer/src/main/java/com/liquidnet/service/consumer/service/processor/ConsumerProcessor.java

@@ -445,4 +445,88 @@ public class ConsumerProcessor {
         log.info("===   CONSUMER_PERFORMANCE_LACK   ===");
         this.consumerSqlDaoHandler(msg, channel);
     }
+
+    // 申请退款
+    @RabbitListener(bindings = @QueueBinding(
+            exchange = @Exchange(MQConst.EXCHANGES_LIQUIDNET_SQL_ORDER_REFUND), key = MQConst.ROUTING_KEY_SQL_ORDER_REFUND,
+            value = @Queue(MQConst.QUEUES_SQL_ORDER_REFUND)
+    ))
+    public void consumerOrderRefund(Message msg, Channel channel) {
+        log.info("===   CONSUMER_ORDER_REFUND   ===");
+        this.consumerSqlDaoHandler(msg, channel);
+    }
+    @RabbitListener(bindings = @QueueBinding(
+            exchange = @Exchange(MQConst.EXCHANGES_LIQUIDNET_SQL_ORDER_REFUND), key = MQConst.ROUTING_KEY_SQL_ORDER_REFUND,
+            value = @Queue(MQConst.QUEUES_SQL_ORDER_REFUND)
+    ))
+    public void consumerOrderRefund1(Message msg, Channel channel) {
+        log.info("===   CONSUMER_ORDER_REFUND   ===");
+        this.consumerSqlDaoHandler(msg, channel);
+    }
+    @RabbitListener(bindings = @QueueBinding(
+            exchange = @Exchange(MQConst.EXCHANGES_LIQUIDNET_SQL_ORDER_REFUND), key = MQConst.ROUTING_KEY_SQL_ORDER_REFUND,
+            value = @Queue(MQConst.QUEUES_SQL_ORDER_REFUND)
+    ))
+    public void consumerOrderRefund2(Message msg, Channel channel) {
+        log.info("===   CONSUMER_ORDER_REFUND   ===");
+        this.consumerSqlDaoHandler(msg, channel);
+    }
+    @RabbitListener(bindings = @QueueBinding(
+            exchange = @Exchange(MQConst.EXCHANGES_LIQUIDNET_SQL_ORDER_REFUND), key = MQConst.ROUTING_KEY_SQL_ORDER_REFUND,
+            value = @Queue(MQConst.QUEUES_SQL_ORDER_REFUND)
+    ))
+    public void consumerOrderRefund3(Message msg, Channel channel) {
+        log.info("===   CONSUMER_ORDER_REFUND   ===");
+        this.consumerSqlDaoHandler(msg, channel);
+    }
+    @RabbitListener(bindings = @QueueBinding(
+            exchange = @Exchange(MQConst.EXCHANGES_LIQUIDNET_SQL_ORDER_REFUND), key = MQConst.ROUTING_KEY_SQL_ORDER_REFUND,
+            value = @Queue(MQConst.QUEUES_SQL_ORDER_REFUND)
+    ))
+    public void consumerOrderRefund4(Message msg, Channel channel) {
+        log.info("===   CONSUMER_ORDER_REFUND   ===");
+        this.consumerSqlDaoHandler(msg, channel);
+    }
+
+    // 申请退款撤回
+    @RabbitListener(bindings = @QueueBinding(
+            exchange = @Exchange(MQConst.EXCHANGES_LIQUIDNET_SQL_ORDER_WITHDRAW), key = MQConst.ROUTING_KEY_SQL_ORDER_WITHDRAW,
+            value = @Queue(MQConst.QUEUES_SQL_ORDER_WITHDRAW)
+    ))
+    public void consumerOrderRefundWithDraw(Message msg, Channel channel) {
+        log.info("===   CONSUMER_ORDER_WITHDRAW   ===");
+        this.consumerSqlDaoHandler(msg, channel);
+    }
+    @RabbitListener(bindings = @QueueBinding(
+            exchange = @Exchange(MQConst.EXCHANGES_LIQUIDNET_SQL_ORDER_WITHDRAW), key = MQConst.ROUTING_KEY_SQL_ORDER_WITHDRAW,
+            value = @Queue(MQConst.QUEUES_SQL_ORDER_WITHDRAW)
+    ))
+    public void consumerOrderRefundWithDraw1(Message msg, Channel channel) {
+        log.info("===   CONSUMER_ORDER_WITHDRAW   ===");
+        this.consumerSqlDaoHandler(msg, channel);
+    }
+    @RabbitListener(bindings = @QueueBinding(
+            exchange = @Exchange(MQConst.EXCHANGES_LIQUIDNET_SQL_ORDER_WITHDRAW), key = MQConst.ROUTING_KEY_SQL_ORDER_WITHDRAW,
+            value = @Queue(MQConst.QUEUES_SQL_ORDER_WITHDRAW)
+    ))
+    public void consumerOrderRefundWithDraw2(Message msg, Channel channel) {
+        log.info("===   CONSUMER_ORDER_WITHDRAW   ===");
+        this.consumerSqlDaoHandler(msg, channel);
+    }
+    @RabbitListener(bindings = @QueueBinding(
+            exchange = @Exchange(MQConst.EXCHANGES_LIQUIDNET_SQL_ORDER_WITHDRAW), key = MQConst.ROUTING_KEY_SQL_ORDER_WITHDRAW,
+            value = @Queue(MQConst.QUEUES_SQL_ORDER_WITHDRAW)
+    ))
+    public void consumerOrderRefundWithDraw3(Message msg, Channel channel) {
+        log.info("===   CONSUMER_ORDER_WITHDRAW   ===");
+        this.consumerSqlDaoHandler(msg, channel);
+    }
+    @RabbitListener(bindings = @QueueBinding(
+            exchange = @Exchange(MQConst.EXCHANGES_LIQUIDNET_SQL_ORDER_WITHDRAW), key = MQConst.ROUTING_KEY_SQL_ORDER_WITHDRAW,
+            value = @Queue(MQConst.QUEUES_SQL_ORDER_WITHDRAW)
+    ))
+    public void consumerOrderRefundWithDraw4(Message msg, Channel channel) {
+        log.info("===   CONSUMER_ORDER_WITHDRAW   ===");
+        this.consumerSqlDaoHandler(msg, channel);
+    }
 }

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

 #eurekaServer配置
 eureka:
   client:
-    register-with-eureka: false
+    register-with-eureka: true
     fetch-registry: true
     serviceUrl:
       defaultZone: http://${liquidnet.security.username}:${liquidnet.security.password}@${liquidnet.eureka.host}/eureka-server/eureka

liquidnet-bus-service/liquidnet-service-kylin/liquidnet-service-kylin-impl/docu/mongo_db_ddl-prod.sql

 use prod_ln_scene;
 #创建集合
-db.createCollection("KylinOrderTicketVo");
+db.createCollection("KylinCheckUserPerformanceVo");
+db.createCollection("KylinCheckUserVo");
+db.createCollection("KylinOrderRefundEntitiesVo");
+db.createCollection("KylinOrderRefundPicVo");
+db.createCollection("KylinOrderRefundsVoBase");
 db.createCollection("KylinOrderTicketEntitiesVo");
+db.createCollection("KylinOrderTicketVo");
+db.createCollection("KylinPerformanceVo");
+db.createCollection("KylinRoadShowVo");
+db.createCollection("KylinPerformanceMisVo");
+db.createCollection("KylinTicketPartnerVo");
+db.createCollection("KylinTicketTimesPartnerVo");
+db.createCollection("PerformanceMemberAuditParam");
 
 #创建索引
+db.KylinCheckUserPerformanceVo.createIndex({checkUserId:"hashed"});
+db.KylinCheckUserVo.createIndex({merchantId:"hashed"});
+db.KylinCheckUserVo.createIndex({mobile:"hashed"});
+db.KylinOrderRefundEntitiesVo.createIndex({orderRefundsId:"hashed"});
+db.KylinOrderRefundEntitiesVo.createIndex({orderTicketEntitiesId:"hashed"});
+db.KylinOrderRefundPicVo.createIndex({orderRefundsId:"hashed"});
+db.KylinOrderRefundsVoBase.createIndex({orderRefundsId:"hashed"});
+db.KylinOrderRefundsVoBase.createIndex({orderTicketsId:"hashed"});
+db.KylinOrderTicketEntitiesVo.createIndex({orderTicketEntitiesId:"hashed"});
+db.KylinOrderTicketEntitiesVo.createIndex({orderId:"hashed"});
 db.KylinOrderTicketVo.createIndex({orderTicketsId:"hashed"});
 db.KylinOrderTicketVo.createIndex({orderCode:"hashed"});
 db.KylinOrderTicketVo.createIndex({userId:"hashed"});
-
-db.KylinOrderTicketEntitiesVo.createIndex({orderTicketEntitiesId:"hashed"});
-db.KylinOrderTicketEntitiesVo.createIndex({orderId:"hashed"});
-
+db.KylinPerformanceVo.createIndex({performancesId:"hashed"});
+db.KylinPerformanceMisVo.createIndex({performancesId:"hashed"});
+db.KylinTicketPartnerVo.createIndex({ticketsId:"hashed"});
+db.KylinTicketPartnerVo.createIndex({timesId:"hashed"});
+db.KylinTicketTimesPartnerVo.createIndex({performancesId:"hashed"});
+db.KylinTicketTimesPartnerVo.createIndex({ticketTimesId:"hashed"});
+db.PerformanceMemberAuditParam.createIndex({performancesId:"hashed"});
 
 #创建分片
 sh.enableSharding("prod_ln_scene");
-
+sh.shardCollection("prod_ln_scene.KylinCheckUserPerformanceVo",{"checkUserId":"hashed"});
+sh.shardCollection("prod_ln_scene.KylinCheckUserVo",{"checkUserId":"hashed"});
+sh.shardCollection("prod_ln_scene.KylinOrderRefundEntitiesVo",{"orderRefundsEntitiesId":"hashed"});
+sh.shardCollection("prod_ln_scene.KylinOrderRefundPicVo",{"refundPicId":"hashed"});
+sh.shardCollection("prod_ln_scene.KylinOrderRefundsVoBase",{"orderRefundsId":"hashed"});
+sh.shardCollection("prod_ln_scene.KylinOrderTicketEntitiesVo",{"orderTicketEntitiesId":"hashed"});
 sh.shardCollection("prod_ln_scene.KylinOrderTicketVo",{"orderTicketsId":"hashed"});
-sh.shardCollection("prod_ln_scene.KylinOrderTicketEntitiesVo",{"orderTicketEntitiesId":"hashed"});
\ No newline at end of file
+sh.shardCollection("prod_ln_scene.KylinPerformanceVo",{"performancesId":"hashed"});
+sh.shardCollection("prod_ln_scene.KylinRoadShowVo",{"roadShowsId":"hashed"});
+sh.shardCollection("prod_ln_scene.KylinPerformanceMisVo",{"performancesId":"hashed"});
+sh.shardCollection("prod_ln_scene.KylinTicketPartnerVo",{"ticketsId":"hashed"});
+sh.shardCollection("prod_ln_scene.KylinTicketTimesPartnerVo",{"ticketTimesId":"hashed"});
+sh.shardCollection("prod_ln_scene.PerformanceMemberAuditParam",{"performancesId":"hashed"});
+

liquidnet-bus-service/liquidnet-service-kylin/liquidnet-service-kylin-impl/docu/mongo_db_ddl.sql

 use test_ln_scene;
 #创建集合
-db.createCollection("KylinOrderTicketVo");
+db.createCollection("KylinCheckUserPerformanceVo");
+db.createCollection("KylinCheckUserVo");
+db.createCollection("KylinOrderRefundEntitiesVo");
+db.createCollection("KylinOrderRefundPicVo");
+db.createCollection("KylinOrderRefundsVoBase");
 db.createCollection("KylinOrderTicketEntitiesVo");
+db.createCollection("KylinOrderTicketVo");
+db.createCollection("KylinPerformanceVo");
+db.createCollection("KylinRoadShowVo");
+db.createCollection("KylinPerformanceMisVo");
+db.createCollection("KylinTicketPartnerVo");
+db.createCollection("KylinTicketTimesPartnerVo");
+db.createCollection("PerformanceMemberAuditParam");
 
 #创建索引
+db.KylinCheckUserPerformanceVo.createIndex({checkUserId:"hashed"});
+db.KylinCheckUserVo.createIndex({merchantId:"hashed"});
+db.KylinCheckUserVo.createIndex({mobile:"hashed"});
+db.KylinOrderRefundEntitiesVo.createIndex({orderRefundsId:"hashed"});
+db.KylinOrderRefundEntitiesVo.createIndex({orderTicketEntitiesId:"hashed"});
+db.KylinOrderRefundPicVo.createIndex({orderRefundsId:"hashed"});
+db.KylinOrderRefundsVoBase.createIndex({orderRefundsId:"hashed"});
+db.KylinOrderRefundsVoBase.createIndex({orderTicketsId:"hashed"});
+db.KylinOrderTicketEntitiesVo.createIndex({orderTicketEntitiesId:"hashed"});
+db.KylinOrderTicketEntitiesVo.createIndex({orderId:"hashed"});
 db.KylinOrderTicketVo.createIndex({orderTicketsId:"hashed"});
 db.KylinOrderTicketVo.createIndex({orderCode:"hashed"});
 db.KylinOrderTicketVo.createIndex({userId:"hashed"});
-
-db.KylinOrderTicketEntitiesVo.createIndex({orderTicketEntitiesId:"hashed"});
-db.KylinOrderTicketEntitiesVo.createIndex({orderId:"hashed"});
-
+db.KylinPerformanceVo.createIndex({performancesId:"hashed"});
+db.KylinPerformanceMisVo.createIndex({performancesId:"hashed"});
+db.KylinTicketPartnerVo.createIndex({ticketsId:"hashed"});
+db.KylinTicketPartnerVo.createIndex({timesId:"hashed"});
+db.KylinTicketTimesPartnerVo.createIndex({performancesId:"hashed"});
+db.KylinTicketTimesPartnerVo.createIndex({ticketTimesId:"hashed"});
+db.PerformanceMemberAuditParam.createIndex({performancesId:"hashed"});
 
 #创建分片
 sh.enableSharding("test_ln_scene");
-
+sh.shardCollection("test_ln_scene.KylinCheckUserPerformanceVo",{"checkUserId":"hashed"});
+sh.shardCollection("test_ln_scene.KylinCheckUserVo",{"checkUserId":"hashed"});
+sh.shardCollection("test_ln_scene.KylinOrderRefundEntitiesVo",{"orderRefundsEntitiesId":"hashed"});
+sh.shardCollection("test_ln_scene.KylinOrderRefundPicVo",{"refundPicId":"hashed"});
+sh.shardCollection("test_ln_scene.KylinOrderRefundsVoBase",{"orderRefundsId":"hashed"});
+sh.shardCollection("test_ln_scene.KylinOrderTicketEntitiesVo",{"orderTicketEntitiesId":"hashed"});
 sh.shardCollection("test_ln_scene.KylinOrderTicketVo",{"orderTicketsId":"hashed"});
-sh.shardCollection("test_ln_scene.KylinOrderTicketEntitiesVo",{"orderTicketEntitiesId":"hashed"});
\ No newline at end of file
+sh.shardCollection("test_ln_scene.KylinPerformanceVo",{"performancesId":"hashed"});
+sh.shardCollection("test_ln_scene.KylinRoadShowVo",{"roadShowsId":"hashed"});
+sh.shardCollection("test_ln_scene.KylinPerformanceMisVo",{"performancesId":"hashed"});
+sh.shardCollection("test_ln_scene.KylinTicketPartnerVo",{"ticketsId":"hashed"});
+sh.shardCollection("test_ln_scene.KylinTicketTimesPartnerVo",{"ticketTimesId":"hashed"});
+sh.shardCollection("test_ln_scene.PerformanceMemberAuditParam",{"performancesId":"hashed"});

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

@@ -7,10 +7,7 @@ import com.liquidnet.service.base.ResponseDto;
 import com.liquidnet.service.kylin.dto.param.PayAgainParam;
 import com.liquidnet.service.kylin.dto.param.PayOrderParam;
 import com.liquidnet.service.kylin.dto.param.SyncOrderParam;
-import com.liquidnet.service.kylin.dto.vo.returns.KylinOrderListVo;
-import com.liquidnet.service.kylin.dto.vo.returns.OrderDetailsVo;
-import com.liquidnet.service.kylin.dto.vo.returns.OrderRefundVo;
-import com.liquidnet.service.kylin.dto.vo.returns.PayResultVo;
+import com.liquidnet.service.kylin.dto.vo.returns.*;
 import com.liquidnet.service.kylin.service.IKylinOrderTicketsService;
 import com.liquidnet.service.kylin.service.impl.KylinOrderTicketsServiceImpl;
 import io.swagger.annotations.Api;
@@ -91,8 +88,8 @@ public class KylinOrderTicketsController {
     @GetMapping("toOrderRefundDetails")
     @ApiOperation("想要退款订单详情")
     @ApiResponse(code = 200, message = "接口返回对象参数")
-    public ResponseDto<OrderDetailsVo> toOrderRefundDetails(@RequestParam(value = "orderId", required = false) @NotNull(message = "订单id不能为空") String orderId) {
-        OrderDetailsVo vo = orderTicketsService.toOrderRefundDetails(orderId);
+    public ResponseDto<KylinOrderTicketPreVo> toOrderRefundDetails(@RequestParam(value = "orderId", required = false) @NotNull(message = "订单id不能为空") String orderId) {
+        KylinOrderTicketPreVo vo = orderTicketsService.toOrderRefundDetails(orderId);
         if (null == vo) {
             return ResponseDto.failure(ErrorMapping.get("20003"));
         } else {
@@ -111,15 +108,15 @@ public class KylinOrderTicketsController {
     }
 
     @GetMapping("orderRefundDetails")
-    @ApiOperation("发起退款申请")
+    @ApiOperation("退款申请详情")
     @ApiResponse(code = 200, message = "接口返回对象参数")
     public ResponseDto<OrderRefundVo> orderRefundDetails(@RequestParam(value = "orderId", required = true) @NotNull(message = "订单id不能为空") String orderId,
                                                          @RequestParam(value = "orderRefundId", required = true) @NotNull(message = "退款订单id不能为空") String orderRefundId) {
         return ResponseDto.success(orderTicketsService.orderRefundDetails(orderId, orderRefundId));
     }
 
-    @PostMapping("sendOrderRefund")
-    @ApiOperation("发起退款申请")
+    @PostMapping("orderRefundWithdraw")
+    @ApiOperation("发起退款撤回")
     @ApiResponse(code = 200, message = "接口返回对象参数")
     public ResponseDto<Boolean> orderRefundWithdraw(@RequestParam(value = "orderRefundId", required = true) @NotNull(message = "退款订单id不能为空") String orderRefundId) {
         return orderTicketsService.orderRefundWithdraw(orderRefundId) == null ? ResponseDto.failure() : ResponseDto.success();

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

@@ -403,6 +403,7 @@ public class KylinRefundsStatusServiceImpl {
             mongoTemplate.insert(orderRefundsVo, KylinOrderRefundsVoBase.class.getSimpleName());
 
 
+
             // 退款入场人表
             KylinOrderRefundEntities kylinOrderRefundEntities = new KylinOrderRefundEntities();
             String orderRefundsEntitiesId = IDGenerator.nextSnowId();
@@ -413,29 +414,30 @@ public class KylinRefundsStatusServiceImpl {
             kylinOrderRefundEntities.setCreatedAt(time);
 
             KylinOrderRefundEntitiesVo orderRefundEntitiesVo = new KylinOrderRefundEntitiesVo();
-            BeanUtils.copyProperties(orderRefundEntitiesVo,kylinOrderRefundEntities);
+            BeanUtils.copyProperties(kylinOrderRefundEntities,orderRefundEntitiesVo);
             orderRefundEntitiesVo.setCreatedAt(strTime);
             mongoTemplate.insert(orderRefundEntitiesVo,KylinOrderRefundEntitiesVo.class.getSimpleName());
 
             //退款图片
             KylinOrderRefundPic orderRefundPic = new KylinOrderRefundPic();
-            orderRefundPic.setOrderRefundsId(IDGenerator.nextSnowId());
+            orderRefundPic.setRefundPicId(IDGenerator.nextSnowId());
             orderRefundPic.setOrderRefundsId(kylinOrderRefunds.getOrderRefundsId());
             orderRefundPic.setPicUrl(picList);
             orderRefundPic.setCreatedAt(time);
 
             KylinOrderRefundPicVo orderRefundPicVo = new KylinOrderRefundPicVo();
-            BeanUtils.copyProperties(orderRefundPicVo,orderRefundPic);
+            BeanUtils.copyProperties(orderRefundPic,orderRefundPicVo);
             orderRefundPicVo.setCreatedAt(strTime);
             mongoTemplate.insert(orderRefundPicVo,KylinOrderRefundPicVo.class.getSimpleName());
 
+            dataUtils.delOrderRefundVoByOrderId(orderInfo.getOrderTicketsId());
             //MQ
             LinkedList<String> sqls = new LinkedList<>();
             LinkedList<Object[]> sqlsDataA = new LinkedList<>();
             LinkedList<Object[]> sqlsDataB = new LinkedList<>();
             LinkedList<Object[]> sqlsDataC = new LinkedList<>();
             LinkedList<Object[]> sqlsDataD = new LinkedList<>();
-            LinkedList<Object[]> sqlsDataE = new LinkedList<>();
+            LinkedList  <Object[]> sqlsDataE = new LinkedList<>();
 
             sqls.add(SqlMapping.get("kylin_order_ticket_status.refund"));
             sqls.add(SqlMapping.get("kylin_order_ticket_entities.refund"));
@@ -465,7 +467,7 @@ public class KylinRefundsStatusServiceImpl {
             });
 
             //TODO 生成新QUERY
-            rabbitTemplate.convertAndSend(MQConst.EXCHANGES_LIQUIDNET_SQL_ORDER_PAY, MQConst.ROUTING_KEY_SQL_ORDER_PAY,
+            rabbitTemplate.convertAndSend(MQConst.EXCHANGES_LIQUIDNET_SQL_ORDER_REFUND, MQConst.ROUTING_KEY_SQL_ORDER_REFUND,
                     SqlMapping.gets(sqls, sqlsDataA, sqlsDataB, sqlsDataC, sqlsDataD, sqlsDataE));
 
             return true;

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

@@ -619,6 +619,14 @@ public class DataUtils {
         return (List<KylinOrderRefundsVoBase>) redisUtil.get(KylinRedisConst.ORDER_REFUND_BY_ORDER_ID + orderId);
     }
 
+    public void delOrderRefundVo(String orderRefundsId){
+        redisUtil.del(KylinRedisConst.ORDER_REFUND + orderRefundsId);
+    }
+
+    public void delOrderRefundVoByOrderId(String orderId){
+        redisUtil.del(KylinRedisConst.ORDER_REFUND_BY_ORDER_ID + orderId);
+    }
+
     /**
      * 获取可退款票单价格
      * @param orderTicketVo         订单vo数据
@@ -632,7 +640,7 @@ public class DataUtils {
         BigDecimal canRefundSinglePrice = new BigDecimal("0.00");
         for (KylinOrderTicketEntitiesVo item : orderTicketVo.getEntitiesVoList()) {
             if (item.getOrderTicketEntitiesId().equals(orderTicketEntitiesId)) {
-                canRefundSinglePrice = singlePrice.subtract(item.getRefundPrice());
+                canRefundSinglePrice = singlePrice.subtract(item.getRefundPrice()==null?BigDecimal.valueOf(0.00):item.getRefundPrice());
             }
         }
         //订单锁定金额