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

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

@@ -474,16 +474,25 @@ public class KylinOrderTicketsServiceImpl implements IKylinOrderTicketsService {
                 // 订单状态表 判断是退到正在退款 已付款 部分退款？(取消，完成，失败)
                 int newIsPayment = 0;
                 int refundingEntitiesCount = 0;
+                BigDecimal entitiesAllPrice = BigDecimal.valueOf(0);
                 for (KylinOrderRefundsVo item2 : orderRefundsVoList) {
                     int status = item2.getStatus();
-                    if (!item2.getOrderRefundsId().equals(orderRefundsId) && (status != 2 && status != 4 && status != 6)) {
+                    if (!item2.getOrderRefundsId().equals(orderRefundsId) && (status != 2 && status != 4 && status != 5 && status != 6)) {
                         for (KylinOrderRefundEntitiesVo item3 : item2.getOrderRefundEntitiesVoList()) {
                             if (item3.getOrderTicketEntitiesId().equals(item.getOrderTicketEntitiesId())) {
                                 refundingEntitiesCount += 1;
                             }
                         }
                     }
+
+                    for (KylinOrderRefundEntitiesVo item3 : item2.getOrderRefundEntitiesVoList()) {
+                        if (item3.getOrderTicketEntitiesId().equals(item.getOrderTicketEntitiesId())) {
+                            entitiesAllPrice.add(item3.getRefundPrice());
+                        }
                     }
+
+                }
+
                 KylinOrderTicketEntitiesVo entitiesVo = null;
                 for (KylinOrderTicketEntitiesVo entitiesVo1 : orderTicketVo.getEntitiesVoList()) {
                     if (entitiesVo1.getOrderTicketEntitiesId().equals(item.getOrderTicketEntitiesId())) {
@@ -491,10 +500,11 @@ public class KylinOrderTicketsServiceImpl implements IKylinOrderTicketsService {
                         break;
                     }
                 }
+
                 if (refundingEntitiesCount > 0) { // 存在其他正在退款的该入场人订单
                     newIsPayment = KylinTableStatusConst.ENTITIES_IS_PAYMENT2;
                 } else {
-                    if (entitiesVo.getRefundPrice().doubleValue() > 0) { // 已经有退完的 那就是部分退款了
+                    if (entitiesAllPrice.subtract(entitiesVo.getRefundPrice()).doubleValue() > 0) { // 已经有退完的 那就是部分退款了
                         newIsPayment = KylinTableStatusConst.ENTITIES_IS_PAYMENT4;
                     } else {
                         newIsPayment = KylinTableStatusConst.ENTITIES_IS_PAYMENT1;

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

@@ -10,43 +10,36 @@ kylin_order_ticket_status.add=INSERT INTO kylin_order_ticket_status(order_ticket
 kylin_order_ticket_entities.add=INSERT INTO kylin_order_ticket_entities(order_ticket_entities_id ,order_id ,ticket_id ,user_id ,time_id ,performance_id ,enter_type ,enter_name ,enter_mobile,enter_id_code,`status`,sys_damai,check_client,is_payment,`comment`,created_at,updated_at)VALUES(?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?)
 
 # ------------------------再次支付----------------------------
-kylin_order_ticket.payAgain=UPDATE kylin_order_tickets SET  updated_at = ? , pay_code = ?  WHERE order_tickets_id = ? and (updated_at <= ? or created_at = ?)
-kylin_order_ticket_status.payAgain=UPDATE kylin_order_ticket_status SET updated_at = ?  WHERE order_id = ? and (updated_at <= ? or created_at = ?)
-kylin_order_ticket_relation.payAgain=UPDATE kylin_order_ticket_relations SET updated_at = ?  WHERE order_id = ? and (updated_at <= ? or created_at = ?)
-kylin_order_ticket_entities.payAgain=UPDATE kylin_order_ticket_entities SET updated_at = ?  WHERE order_id = ? and (updated_at <= ? or created_at = ?)
+kylin_order_ticket.payAgain=UPDATE kylin_order_tickets SET  updated_at = ? , pay_code = ?  WHERE order_tickets_id = ? and (updated_at <= ? or created_at = ? or updated_at is null)
+kylin_order_ticket_status.payAgain=UPDATE kylin_order_ticket_status SET updated_at = ?  WHERE order_id = ? and (updated_at <= ? or created_at = ? or updated_at is null)
+kylin_order_ticket_relation.payAgain=UPDATE kylin_order_ticket_relations SET updated_at = ?  WHERE order_id = ? and (updated_at <= ? or created_at = ? or updated_at is null)
+kylin_order_ticket_entities.payAgain=UPDATE kylin_order_ticket_entities SET updated_at = ?  WHERE order_id = ? and (updated_at <= ? or created_at = ? or updated_at is null)
 
 
 
 # ------------------------支付回调----------------------------
-kylin_order_ticket.synPay=UPDATE  kylin_order_tickets SET payment_type = ? ,pay_code = ? , time_pay = ?, qr_code = ? , updated_at = ? WHERE order_tickets_id = ? and (updated_at <= ? or created_at = ?)
-kylin_order_ticket_status.synPay=UPDATE kylin_order_ticket_status SET `status` = ?,pay_status = ?,updated_at = ? WHERE order_id = ? and (updated_at <= ? or created_at = ?)
-kylin_order_ticket_relation.synPay=UPDATE kylin_order_ticket_relations SET updated_at = ? WHERE order_id = ? and (updated_at <= ? or created_at = ?)
-kylin_order_ticket_entities.synPay=UPDATE kylin_order_ticket_entities SET is_payment = ?,updated_at = ?,sys_damai = 1 WHERE order_id = ? and (updated_at <= ? or created_at = ?)
-
-
-
-# ------------------------订单关闭----------------------------
-kylin_order_ticket.close=UPDATE kylin_order_tickets SET updated_at = ? WHERE order_tickets_id = ?
-kylin_order_ticket_status.close=UPDATE kylin_order_ticket_status SET `status` = ?,updated_at = ? WHERE order_id = ?
-kylin_order_ticket_relation.close=UPDATE kylin_order_ticket_relations SET updated_at = ? WHERE order_id = ?
+kylin_order_ticket.synPay=UPDATE  kylin_order_tickets SET payment_type = ? ,pay_code = ? , time_pay = ?, qr_code = ? , updated_at = ? WHERE order_tickets_id = ? and (updated_at <= ? or created_at = ? or updated_at is null)
+kylin_order_ticket_status.synPay=UPDATE kylin_order_ticket_status SET `status` = ?,pay_status = ?,updated_at = ? WHERE order_id = ? and (updated_at <= ? or created_at = ? or updated_at is null)
+kylin_order_ticket_relation.synPay=UPDATE kylin_order_ticket_relations SET updated_at = ? WHERE order_id = ? and (updated_at <= ? or created_at = ? or updated_at is null)
+kylin_order_ticket_entities.synPay=UPDATE kylin_order_ticket_entities SET is_payment = ?,updated_at = ?,sys_damai = 1 WHERE order_id = ? and (updated_at <= ? or created_at = ? or updated_at is null)
 
 
 
 # ------------------------用户发起订单退款----------------------------
-kylin_order_ticket_status.refund=UPDATE kylin_order_ticket_status SET status = ? ,updated_at = ?  WHERE order_id = ? and (updated_at <= ? or created_at = ?)
-kylin_order_ticket_entities.refund=UPDATE kylin_order_ticket_entities SET is_payment = ? ,updated_at = ?  WHERE order_ticket_entities_id = ? and (updated_at <= ? or created_at = ?)
+kylin_order_ticket_status.refund=UPDATE kylin_order_ticket_status SET status = ? ,updated_at = ?  WHERE order_id = ? and (updated_at <= ? or created_at = ? or updated_at is null)
+kylin_order_ticket_entities.refund=UPDATE kylin_order_ticket_entities SET is_payment = ? ,updated_at = ?  WHERE order_ticket_entities_id = ? and (updated_at <= ? or created_at = ? or updated_at is null)
 kylin_order_refund.refund=INSERT INTO kylin_order_refunds (order_refunds_id,order_tickets_id,order_refund_code,price,price_express,status,type,applicant_id,applicant_name,applicant_at,reason,refund_cate,created_at) VALUES(?,?,?,?,?,?,?,?,?,?,?,?,?)
 kylin_order_refund_entities.refund=INSERT INTO kylin_order_refund_entities (order_refunds_entities_id,order_refunds_id,refund_price,order_ticket_entities_id,created_at) VALUES(?,?,?,?,?)
 kylin_order_refund_pic.refund=INSERT INTO kylin_order_refund_pic (refund_pic_id,order_refunds_id,pic_url,created_at) VALUES (?,?,?,?)
 
 # ------------------------用户发起订单退款撤回----------------------------
-kylin_order_ticket_status.withDraw=UPDATE kylin_order_ticket_status SET status = ? ,updated_at = ?  WHERE order_id = ? and (updated_at <= ? or created_at = ?)
-kylin_order_ticket_entities.withDraw=UPDATE kylin_order_ticket_entities SET is_payment = ?,updated_at = ?,sys_damai = 1 WHERE order_id = ? and (updated_at <= ? or created_at = ?)
+kylin_order_ticket_status.withDraw=UPDATE kylin_order_ticket_status SET status = ? ,updated_at = ?  WHERE order_id = ? and (updated_at <= ? or created_at = ? or updated_at is null)
+kylin_order_ticket_entities.withDraw=UPDATE kylin_order_ticket_entities SET is_payment = ?,updated_at = ?,sys_damai = 1 WHERE order_id = ? and (updated_at <= ? or created_at = ? or updated_at is null)
 kylin_order_refund.withDraw=UPDATE kylin_order_refunds SET status = ? ,updated_at = ?  WHERE order_refunds_id = ?
 
 # ------------------------超时支付申请退款----------------------------
-kylin_order_ticket_status.overtimeRefund=UPDATE kylin_order_ticket_status SET status = ? ,updated_at = ?  WHERE order_id = ? and (updated_at <= ? or created_at = ?)
-kylin_order_ticket_entities.overtimeRefund=UPDATE kylin_order_ticket_entities SET is_payment = ? ,updated_at = ?  WHERE order_ticket_entities_id = ? and (updated_at <= ? or created_at = ?)
+kylin_order_ticket_status.overtimeRefund=UPDATE kylin_order_ticket_status SET status = ? ,updated_at = ?  WHERE order_id = ? and (updated_at <= ? or created_at = ? or updated_at is null)
+kylin_order_ticket_entities.overtimeRefund=UPDATE kylin_order_ticket_entities SET is_payment = ? ,updated_at = ?  WHERE order_ticket_entities_id = ? and (updated_at <= ? or created_at = ? or updated_at is null)
 kylin_order_refund.overtimeRefund=INSERT INTO kylin_order_refunds (order_refunds_id,order_tickets_id,order_refund_code,price,price_express,status,type,applicant_id,applicant_name,applicant_at,reason,refund_cate,created_at) VALUES(?,?,?,?,?,?,?,?,?,?,?,?,?)
 kylin_order_refund_entities.overtimeRefund=INSERT INTO kylin_order_refund_entities (order_refunds_entities_id,order_refunds_id,refund_price,order_ticket_entities_id,created_at) VALUES(?,?,?,?,?)
 

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

@@ -865,21 +865,20 @@ public class KylinOrderTicketsServiceImpl implements IKylinOrderTicketsOrderServ
 
                 SmsEnum.ADTemplate adTemplate = null;
                 if (orderTicketData.getGetTicketType().equals("express")) {
-
                     adTemplate = SmsEnum.ADTemplate.SMS_181490473;
                 } else if (orderTicketData.getGetTicketType().equals("electronic")) {
                     adTemplate = ticketData.getIsShowCode() == 1 ? SmsEnum.ADTemplate.SMS_171358560 : SmsEnum.ADTemplate.SMS_181500419;
                 }
 
-//                if (null != adTemplate) {
-//                    queueUtils.sendMsgByRedis(MQConst.KylinQueue.SMS_NOTICE.getKey(),
-//                            SmsMessage.builder().setPhone(orderTicketData.getUserMobile())
-//                                    .setSignName(SmsEnum.ADSignName.M02.getVal())
-//                                    .setTemplateCode(adTemplate.name())
-//                                    .setTemplateParam("name", orderTicketData.getPerformanceTitle())
-//                                    .setTemplateParam("time", time1 + " " + time2).toJson()
-//                    );
-//                }
+                if (null != adTemplate) {
+                    queueUtils.sendMsgByRedis(MQConst.KylinQueue.SMS_NOTICE.getKey(),
+                            SmsMessage.builder().setPhone(orderTicketData.getUserMobile())
+                                    .setSignName(SmsEnum.ADSignName.M02.getVal())
+                                    .setTemplateCode(adTemplate.name())
+                                    .setTemplateParam("name", orderTicketData.getPerformanceTitle())
+                                    .setTemplateParam("time", time1 + " " + time2).toJson()
+                    );
+                }
 
                 // 大麦回调
                 sycDamaiOrder(orderTickets.getOrderTicketsId());

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

@@ -10,44 +10,35 @@ kylin_order_ticket_status.add=INSERT INTO kylin_order_ticket_status(order_ticket
 kylin_order_ticket_entities.add=INSERT INTO kylin_order_ticket_entities(order_ticket_entities_id ,order_id ,ticket_id ,user_id ,time_id ,performance_id ,enter_type ,enter_name ,enter_mobile,enter_id_code,`status`,sys_damai,check_client,is_payment,`comment`,created_at,updated_at)VALUES(?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?)
 
 # ------------------------再次支付----------------------------
-kylin_order_ticket.payAgain=UPDATE kylin_order_tickets SET  updated_at = ? , pay_code = ?  WHERE order_tickets_id = ? and (updated_at <= ? or created_at = ?)
-kylin_order_ticket_status.payAgain=UPDATE kylin_order_ticket_status SET updated_at = ?  WHERE order_id = ? and (updated_at <= ? or created_at = ?)
-kylin_order_ticket_relation.payAgain=UPDATE kylin_order_ticket_relations SET updated_at = ?  WHERE order_id = ? and (updated_at <= ? or created_at = ?)
-kylin_order_ticket_entities.payAgain=UPDATE kylin_order_ticket_entities SET updated_at = ?  WHERE order_id = ? and (updated_at <= ? or created_at = ?)
-
+kylin_order_ticket.payAgain=UPDATE kylin_order_tickets SET  updated_at = ? , pay_code = ?  WHERE order_tickets_id = ? and (updated_at <= ? or created_at = ? or updated_at is null)
+kylin_order_ticket_status.payAgain=UPDATE kylin_order_ticket_status SET updated_at = ?  WHERE order_id = ? and (updated_at <= ? or created_at = ? or updated_at is null)
+kylin_order_ticket_relation.payAgain=UPDATE kylin_order_ticket_relations SET updated_at = ?  WHERE order_id = ? and (updated_at <= ? or created_at = ? or updated_at is null)
+kylin_order_ticket_entities.payAgain=UPDATE kylin_order_ticket_entities SET updated_at = ?  WHERE order_id = ? and (updated_at <= ? or created_at = ? or updated_at is null)
 
 
 # ------------------------支付回调----------------------------
-kylin_order_ticket.synPay=UPDATE  kylin_order_tickets SET payment_id =? ,payment_type = ? ,pay_code = ? , time_pay = ?, qr_code = ? , updated_at = ? WHERE order_tickets_id = ? and (updated_at <= ? or created_at = ?)
-kylin_order_ticket_status.synPay=UPDATE kylin_order_ticket_status SET `status` = ?,pay_status = ?,updated_at = ? WHERE order_id = ? and (updated_at <= ? or created_at = ?)
-kylin_order_ticket_relation.synPay=UPDATE kylin_order_ticket_relations SET updated_at = ? WHERE order_id = ? and (updated_at <= ? or created_at = ?)
-kylin_order_ticket_entities.synPay=UPDATE kylin_order_ticket_entities SET is_payment = ?,updated_at = ?,sys_damai = 1 WHERE order_id = ? and (updated_at <= ? or created_at = ?)
-
-
-
-# ------------------------订单关闭----------------------------
-kylin_order_ticket.close=UPDATE kylin_order_tickets SET updated_at = ? WHERE order_tickets_id = ?
-kylin_order_ticket_status.close=UPDATE kylin_order_ticket_status SET `status` = ?,updated_at = ? WHERE order_id = ?
-kylin_order_ticket_relation.close=UPDATE kylin_order_ticket_relations SET updated_at = ? WHERE order_id = ?
-
+kylin_order_ticket.synPay=UPDATE  kylin_order_tickets SET payment_id =? ,payment_type = ? ,pay_code = ? , time_pay = ?, qr_code = ? , updated_at = ? WHERE order_tickets_id = ? and (updated_at <= ? or created_at = ? or updated_at is null)
+kylin_order_ticket_status.synPay=UPDATE kylin_order_ticket_status SET `status` = ?,pay_status = ?,updated_at = ? WHERE order_id = ? and (updated_at <= ? or created_at = ? or updated_at is null)
+kylin_order_ticket_relation.synPay=UPDATE kylin_order_ticket_relations SET updated_at = ? WHERE order_id = ? and (updated_at <= ? or created_at = ? or updated_at is null)
+kylin_order_ticket_entities.synPay=UPDATE kylin_order_ticket_entities SET is_payment = ?,updated_at = ?,sys_damai = 1 WHERE order_id = ? and (updated_at <= ? or created_at = ? or updated_at is null)
 
 
 # ------------------------用户发起订单退款----------------------------
-kylin_order_ticket_status.refund=UPDATE kylin_order_ticket_status SET status = ? ,updated_at = ?  WHERE order_id = ? and (updated_at <= ? or created_at = ?)
-kylin_order_ticket_entities.refund=UPDATE kylin_order_ticket_entities SET is_payment = ? ,updated_at = ?  WHERE order_ticket_entities_id = ? and (updated_at <= ? or created_at = ?)
+kylin_order_ticket_status.refund=UPDATE kylin_order_ticket_status SET status = ? ,updated_at = ?  WHERE order_id = ? and (updated_at <= ? or created_at = ? or updated_at is null)
+kylin_order_ticket_entities.refund=UPDATE kylin_order_ticket_entities SET is_payment = ? ,updated_at = ?  WHERE order_ticket_entities_id = ? and (updated_at <= ? or created_at = ? or updated_at is null)
 kylin_order_refund.refund=INSERT INTO kylin_order_refunds (order_refunds_id,order_tickets_id,order_refund_code,price,price_express,status,type,applicant_id,applicant_name,applicant_at,reason,refund_cate,created_at) VALUES(?,?,?,?,?,?,?,?,?,?,?,?,?)
 kylin_order_refund_entities.refund=INSERT INTO kylin_order_refund_entities (order_refunds_entities_id,order_refunds_id,refund_price,order_ticket_entities_id,created_at) VALUES(?,?,?,?,?)
 kylin_order_refund_pic.refund=INSERT INTO kylin_order_refund_pic (refund_pic_id,order_refunds_id,pic_url,created_at) VALUES (?,?,?,?)
 
 # ------------------------用户发起订单退款撤回----------------------------
-kylin_order_ticket_status.withDraw=UPDATE kylin_order_ticket_status SET status = ? ,updated_at = ?  WHERE order_id = ? and (updated_at <= ? or created_at = ?)
-kylin_order_ticket_entities.withDraw=UPDATE kylin_order_ticket_entities SET is_payment = ?,updated_at = ?,sys_damai = 1 WHERE order_id = ? and (updated_at <= ? or created_at = ?)
+kylin_order_ticket_status.withDraw=UPDATE kylin_order_ticket_status SET status = ? ,updated_at = ?  WHERE order_id = ? and (updated_at <= ? or created_at = ? or updated_at is null)
+kylin_order_ticket_entities.withDraw=UPDATE kylin_order_ticket_entities SET is_payment = ?,updated_at = ?,sys_damai = 1 WHERE order_id = ? and (updated_at <= ? or created_at = ? or updated_at is null)
 kylin_order_refund.withDraw=UPDATE kylin_order_refunds SET status = ? ,updated_at = ?  WHERE order_refunds_id = ?
 
 # ------------------------超时支付申请退款----------------------------
-kylin_order_ticket_status.overtimeRefund=UPDATE kylin_order_ticket_status SET status = ? ,updated_at = ?  WHERE order_id = ? and (updated_at <= ? or created_at = ?)
-kylin_order_tickets.overtimeRefund=UPDATE kylin_order_tickets SET payment_id = ? , payment_type = ? ,updated_at = ?  WHERE order_tickets_id = ? and (updated_at <= ? or created_at = ?)
-kylin_order_ticket_entities.overtimeRefund=UPDATE kylin_order_ticket_entities SET is_payment = ? ,updated_at = ?  WHERE order_ticket_entities_id = ? and (updated_at <= ? or created_at = ?)
+kylin_order_ticket_status.overtimeRefund=UPDATE kylin_order_ticket_status SET status = ? ,updated_at = ?  WHERE order_id = ? and (updated_at <= ? or created_at = ? or updated_at is null)
+kylin_order_tickets.overtimeRefund=UPDATE kylin_order_tickets SET payment_id = ? , payment_type = ? ,updated_at = ?  WHERE order_tickets_id = ? and (updated_at <= ? or created_at = ? or updated_at is null)
+kylin_order_ticket_entities.overtimeRefund=UPDATE kylin_order_ticket_entities SET is_payment = ? ,updated_at = ?  WHERE order_ticket_entities_id = ? and (updated_at <= ? or created_at = ? or updated_at is null)
 kylin_order_refund.overtimeRefund=INSERT INTO kylin_order_refunds (order_refunds_id,order_tickets_id,order_refund_code,price,price_express,status,type,applicant_id,applicant_name,applicant_at,reason,refund_cate,created_at) VALUES(?,?,?,?,?,?,?,?,?,?,?,?,?)
 kylin_order_refund_entities.overtimeRefund=INSERT INTO kylin_order_refund_entities (order_refunds_entities_id,order_refunds_id,refund_price,order_ticket_entities_id,created_at) VALUES(?,?,?,?,?)
 

liquidnet-bus-service/liquidnet-service-sweet/src/main/java/com/liquidnet/service/sweet/constant/SweetConstant.java

@@ -17,17 +17,17 @@ public class SweetConstant {
     public static final String REDIS_KEY_SWEET_REMIND_ALL = "sweet:remind:unionId*";
 
     public enum ManualPosition {
-        POSITION_1("艺人"),
-        POSITION_2("签售时间"),
-        POSITION_3("吃喝玩乐"),
-        POSITION_4("现场地图"),
-        POSITION_5("如何到达"),
-        POSITION_6("官方售卖"),
-        POSITION_7("官方支持"),
-        POSITION_8("观众须知"),
-        POSITION_9("防疫指南"),
-        POSITION_10("通知"),
-        POSITION_11("观演攻略");
+        artist("艺人"),
+        signingTime("签售时间"),
+        foodAndAmusement("吃喝玩乐"),
+        siteMap("现场地图"),
+        howToReach("如何到达"),
+//        POSITION_6("官方售卖"),
+        officialSupport("官方支持"),
+        audienceNotice("观众须知"),
+        preventionGuidelines("防疫指南"),
+        notice("通知"),
+        strategy("观演攻略");
 
         private String message;
 

liquidnet-bus-service/liquidnet-service-sweet/src/main/java/com/liquidnet/service/sweet/controller/SweetAppletController.java

@@ -11,10 +11,7 @@ import com.liquidnet.service.sweet.entity.SweetRichtext;
 import com.liquidnet.service.sweet.entity.SweetStage;
 import com.liquidnet.service.sweet.utils.RedisDataUtils;
 import com.liquidnet.service.sweet.vo.SweetArtistsRelationVo;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiImplicitParam;
-import io.swagger.annotations.ApiImplicitParams;
-import io.swagger.annotations.ApiOperation;
+import io.swagger.annotations.*;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 

liquidnet-bus-service/liquidnet-service-sweet/src/main/java/com/liquidnet/service/sweet/controller/SweetManualController.java

@@ -43,6 +43,16 @@ public class SweetManualController {
         return sweetManualService.getManualList(page, size, name);
     }
 
+
+    @GetMapping("details")
+    @ApiOperation("宣传手册详情")
+    @ApiImplicitParams({
+            @ApiImplicitParam(type = "query", dataType = "String", name = "manualId", value = "手册id"),
+    })
+    public ResponseDto<SweetManualDto> details(@RequestParam(required = false) String manualId) {
+        return sweetManualService.details(manualId);
+    }
+
     @PostMapping("changeRelease")
     @ApiOperation("修改是否发布")
     @ApiImplicitParams({

liquidnet-bus-service/liquidnet-service-sweet/src/main/java/com/liquidnet/service/sweet/controller/SweetManualNotifyController.java

@@ -62,10 +62,10 @@ public class SweetManualNotifyController {
     @GetMapping("detail")
     @ApiOperation("通知详情")
     @ApiImplicitParams({
-            @ApiImplicitParam(type = "query", dataType = "String", name = "manualId", value = "手册id", required = true),
+            @ApiImplicitParam(type = "query", dataType = "String", name = "manualNotifyId", value = "通知id", required = true),
     })
-    public ResponseDto<SweetManualNotify> detail(@RequestParam() String manualId) {
-        return sweetManualNotifyService.details(manualId);
+    public ResponseDto<SweetManualNotify> detail(@RequestParam() String manualNotifyId) {
+        return sweetManualNotifyService.details(manualNotifyId);
     }
 
     @PostMapping("change")

liquidnet-bus-service/liquidnet-service-sweet/src/main/java/com/liquidnet/service/sweet/dto/SweetManualAppletDto.java

 package com.liquidnet.service.sweet.dto;
 
 import com.liquidnet.service.sweet.entity.SweetManualSort;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 import java.io.Serializable;
 
 @Data
+@ApiModel
 public class SweetManualAppletDto implements Serializable ,Cloneable{
+    @ApiModelProperty("电子手册id")
     private String manualId;
+    @ApiModelProperty("演出id")
     private String performancesId;
+    @ApiModelProperty("演出标题")
     private String title;
+    @ApiModelProperty("场地id")
     private String fieldId;
+    @ApiModelProperty("场地名称")
     private String fieldName;
+    @ApiModelProperty("城市名称")
     private String cityName;
+    @ApiModelProperty("演出开始时间")
     private String timeStart;
+    @ApiModelProperty("演出结束时间")
     private String timeEnd;
 
+    @ApiModelProperty("经度")
     private String longitude;
+    @ApiModelProperty("纬度")
     private String latitude;
 
 

liquidnet-bus-service/liquidnet-service-sweet/src/main/java/com/liquidnet/service/sweet/dto/SweetManualArtistListDto.java

 package com.liquidnet.service.sweet.dto;
 
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 import java.io.Serializable;
 import java.util.ArrayList;
 
 @Data
+@ApiModel
 public class SweetManualArtistListDto implements Serializable,Cloneable {
 
+    @ApiModelProperty("电子手册关联id")
     private String manualRelationId;
+    @ApiModelProperty("艺人id")
     private String artistId;
+    @ApiModelProperty("艺人名称")
     private String name;
+    @ApiModelProperty("舞台id")
     private String stageId;
+    @ApiModelProperty("舞台名称")
     private String title;
+    @ApiModelProperty("演出开始")
     private String performanceStart;
+    @ApiModelProperty("演出结束")
     private String performanceEnd;
+    @ApiModelProperty("签售开始")
     private String signatureStart;
+    @ApiModelProperty("签售结束")
     private String signatureEnd;
 
+    @ApiModelProperty("是否观看")
     private Integer isWatch;
+    @ApiModelProperty("是否登记")
     private Integer isSign;
 
     private static final SweetManualArtistListDto obj = new SweetManualArtistListDto();

liquidnet-bus-service/liquidnet-service-sweet/src/main/java/com/liquidnet/service/sweet/dto/SweetManualDto.java

 package com.liquidnet.service.sweet.dto;
 
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 import java.io.Serializable;
 
 @Data
+@ApiModel
 public class SweetManualDto implements Serializable ,Cloneable{
 
+    @ApiModelProperty("电子手册id")
     private String manualId;
+    @ApiModelProperty("演出id")
     private String performancesId;
+    @ApiModelProperty("演出名称")
     private String title;
+    @ApiModelProperty("演出开始时间")
     private String timeStart;
+    @ApiModelProperty("演出结束时间")
     private String timeEnd;
+    @ApiModelProperty("售卖时间")
     private String timeSell;
+    @ApiModelProperty("停售时间")
     private String timeStop;
+    @ApiModelProperty("状态")
     private Integer status;
+    @ApiModelProperty("手册状态")
     private Integer manualStatus;
+    @ApiModelProperty("是否发布")
     private Integer isRelease;
 
     private static final SweetManualDto obj = new SweetManualDto();

liquidnet-bus-service/liquidnet-service-sweet/src/main/java/com/liquidnet/service/sweet/mapper/SweetManualMapper.java

@@ -20,5 +20,7 @@ public interface SweetManualMapper extends BaseMapper<SweetManual> {
 
     List<SweetManualDto> getManualList(Map<String,Object> map);
 
+    SweetManualDto getManualDetails(Map<String,Object> map);
+
     List<SweetManualAppletDto> getManualAppletDto();
 }

liquidnet-bus-service/liquidnet-service-sweet/src/main/java/com/liquidnet/service/sweet/service/ISweetManualService.java

@@ -22,6 +22,8 @@ public interface ISweetManualService extends IService<SweetManual> {
 
     ResponseDto<PageInfo<SweetManualDto>> getManualList(int page, int size, String name);
 
+    ResponseDto<SweetManualDto> details( String manualId);
+
     //关闭开启
     ResponseDto<Boolean> changeStatus(String manualId, String performancesId, Integer status);
 

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

@@ -73,9 +73,9 @@ public class SweetManualNotifyServiceImpl extends ServiceImpl<SweetManualNotifyM
     }
 
     @Override
-    public ResponseDto<SweetManualNotify> details(String manualId) {
+    public ResponseDto<SweetManualNotify> details(String manualNotifyId) {
         try {
-            return ResponseDto.success(sweetManualNotifyMapper.selectOne(Wrappers.lambdaQuery(SweetManualNotify.class).eq(SweetManualNotify::getManualId, manualId).eq(SweetManualNotify::getStatus, 1)));
+            return ResponseDto.success(sweetManualNotifyMapper.selectOne(Wrappers.lambdaQuery(SweetManualNotify.class).eq(SweetManualNotify::getManualNotifyId, manualNotifyId).eq(SweetManualNotify::getStatus, 1)));
         } catch (Exception e) {
             return ResponseDto.failure();
         }

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

@@ -68,6 +68,29 @@ public class SweetManualServiceImpl extends ServiceImpl<SweetManualMapper, Sweet
         return ResponseDto.success(pageInfoTmp);
     }
 
+    @Override
+    public ResponseDto<SweetManualDto> details(String manualId) {
+        SweetManualDto vo;
+        try {
+            HashMap<String, Object> map = CollectionUtil.mapStringObject();
+            map.put("manualId", manualId);
+            vo = sweetManualMapper.getManualDetails(map);
+            if (vo.getStatus() >= 6 && vo.getStatus() != 7) {
+                if (DateUtil.compareStrDay(vo.getTimeSell(), DateUtil.getNowTime()) > 0) {//未开始
+                    vo.setStatus(9);
+                } else if (DateUtil.compareStrDay(vo.getTimeStop(), DateUtil.getNowTime()) < 0) {//已结束
+                    vo.setStatus(10);
+                } else {
+                    vo.setStatus(6);
+                }
+            }
+        } catch (Exception e) {
+            e.printStackTrace();
+            return ResponseDto.failure(ErrorMapping.get(20104));
+        }
+        return ResponseDto.success(vo);
+    }
+
     @Override
     public ResponseDto<Boolean> changeStatus(String manualId, String performancesId, Integer status) {
         try {

liquidnet-bus-service/liquidnet-service-sweet/src/main/resources/com/liquidnet/service/sweet/mapper/SweetManualMapper.xml

@@ -69,6 +69,41 @@
         ORDER BY p.created_at desc
     </select>
 
+    <!-- 电子手册详情 -->
+    <select id="getManualDetails" parameterType="java.util.Map" resultMap="partnerPerformanceListResult">
+        SELECT IFNULL(sm.manual_id, 0)  as 'manual_id',
+               p.performances_id,
+               p.title,
+               p.time_start,
+               p.time_end,
+               ps.status,
+               t.time_sell,
+               t.time_stop,
+               IFNULL(sm.status, 0)     as 'manualStatus',
+               IFNULL(sm.is_release, 0) as 'is_release'
+        FROM kylin_performances AS p
+                 LEFT JOIN kylin_performance_status AS ps ON p.performances_id = ps.performance_id
+                 LEFT JOIN kylin_performance_relations AS pr ON p.performances_id = pr.performance_id
+                 LEFT JOIN sweet_manual AS sm ON p.performances_id = sm.performance_id
+                 LEFT JOIN(
+            SELECT ttr.performance_id,
+                   MIN(
+                           DATE_SUB(
+                                   t.time_start,
+                                   INTERVAL pay_countdown_minute MINUTE
+                               )
+                       )           AS 'time_sell',
+                   MAX(t.time_end) AS 'time_stop'
+            FROM kylin_ticket_status AS ts
+                     LEFT JOIN kylin_ticket_relations AS tr ON tr.ticket_id = ts.ticket_id
+                     LEFT JOIN kylin_tickets AS t ON t.tickets_id = ts.ticket_id
+                     LEFT JOIN kylin_ticket_time_relation AS ttr ON tr.times_id = ttr.times_id
+            GROUP BY ttr.performance_id
+        ) AS t ON p.performances_id = t.performance_id
+        where sm.manual_id = #{manualId}
+        ORDER BY p.created_at desc
+    </select>
+
 
     <select id="getManualAppletList" resultMap="getManualAppletListResult">
         select manual_id, performances_id, title, field_id, city_name, time_start, time_end