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

liquidnet-bus-service/liquidnet-service-kylin/liquidnet-service-kylin-api/src/main/java/com/liquidnet/service/kylin/dto/param/TicketCreateParam.java

@@ -75,19 +75,22 @@ public class TicketCreateParam implements Serializable {
     private String createdAt;
 
     @JsonIgnore
-    public KylinTickets kylinTickets(String ticketsId, LocalDateTime createdAt) {
+    public KylinTickets kylinTickets(String ticketsId, LocalDateTime createdAt, LocalDateTime updatedAt) {
         KylinTickets kylinTickets = new KylinTickets();
         BeanUtils.copyProperties(this, kylinTickets);
         kylinTickets.setTicketsId(ticketsId);
         kylinTickets.setPriceDiscount(BigDecimal.valueOf(0.00));
         kylinTickets.setPriceDiscountMember(BigDecimal.valueOf(0.00));
+        if (createdAt != null)
             kylinTickets.setCreatedAt(createdAt);
+        if (updatedAt != null)
+            kylinTickets.setUpdatedAt(updatedAt);
         //TODO 各种说明文案
         return kylinTickets;
     }
 
     @JsonIgnore
-    public KylinTicketStatus kylinTicketStatus(String ticketsId, LocalDateTime createdAt) {
+    public KylinTicketStatus kylinTicketStatus(String ticketsId, LocalDateTime createdAt, LocalDateTime updatedAt) {
         KylinTicketStatus kylinTicketStatus = new KylinTicketStatus();
         BeanUtils.copyProperties(this, kylinTicketStatus);
         kylinTicketStatus.setTicketStatusId(IDGenerator.nextSnowId().toString());
@@ -95,15 +98,23 @@ public class TicketCreateParam implements Serializable {
         kylinTicketStatus.setStatusExchange(7);
         kylinTicketStatus.setSurplusExchange(this.totalExchange);
         kylinTicketStatus.setSurplusGeneral(this.totalGeneral);
+        if (createdAt != null)
+            kylinTicketStatus.setCreatedAt(createdAt);
+        if (updatedAt != null)
+            kylinTicketStatus.setUpdatedAt(updatedAt);
         return kylinTicketStatus;
     }
 
     @JsonIgnore
-    public KylinTicketRelations kylinTicketRelations(String ticketsId, LocalDateTime createdAt) {
+    public KylinTicketRelations kylinTicketRelations(String ticketsId, LocalDateTime createdAt, LocalDateTime updatedAt) {
         KylinTicketRelations kylinTicketRelations = new KylinTicketRelations();
         BeanUtils.copyProperties(this, kylinTicketRelations);
         kylinTicketRelations.setTicketId(ticketsId);
         kylinTicketRelations.setTicketRelationsId(IDGenerator.nextSnowId().toString());
+        if (createdAt != null)
+            kylinTicketRelations.setCreatedAt(createdAt);
+        if (updatedAt != null)
+            kylinTicketRelations.setUpdatedAt(updatedAt);
         return kylinTicketRelations;
     }
 }
\ No newline at end of file

liquidnet-bus-service/liquidnet-service-kylin/liquidnet-service-kylin-impl/src/main/java/com/liquidnet/service/kylin/controller/partner/KylinTicketsParnterController.java → liquidnet-bus-service/liquidnet-service-kylin/liquidnet-service-kylin-impl/src/main/java/com/liquidnet/service/kylin/controller/partner/KylinTicketsPartnerController.java

@@ -26,7 +26,7 @@ import org.springframework.web.bind.annotation.*;
 @Api
 @RestController
 @RequestMapping("/partner/ticket")
-public class KylinTicketsParnterController {
+public class KylinTicketsPartnerController {
 
     @Autowired
     private KylinTicketsPartnerServiceImpl ticketsPartnerService;
@@ -34,7 +34,7 @@ public class KylinTicketsParnterController {
     @PostMapping(value = "")
     @ApiOperation(value = "创建票务")
     @ApiResponse(response = TicketVo.class, code = 200, message = "接口返回对象参数")
-    public ResponseDto<TicketVo> fieldDetails(@RequestBody TicketCreateParam ticketCreateParam) {
+    public ResponseDto<TicketVo> createTicket(@RequestBody TicketCreateParam ticketCreateParam) {
         TicketVo result = null;
         result = ticketsPartnerService.createTicket(ticketCreateParam);
         if (null == result) {
@@ -43,4 +43,42 @@ public class KylinTicketsParnterController {
             return ResponseDto.success(result);
         }
     }
+
+    @PutMapping(value = "")
+    @ApiOperation(value = "修改票务")
+    @ApiResponse(response = TicketVo.class, code = 200, message = "接口返回对象参数")
+    public ResponseDto<TicketVo> updateTicket(@RequestBody TicketCreateParam ticketCreateParam) {
+        TicketVo result = null;
+        result = ticketsPartnerService.updateTicket(ticketCreateParam);
+        if (null == result) {
+            return ResponseDto.failure("修改票务失败");
+        } else {
+            return ResponseDto.success(result);
+        }
+    }
+
+    @DeleteMapping(value = "")
+    @ApiOperation(value = "删除票务")
+    @ApiResponse( code = 200, message = "接口返回对象参数")
+    public ResponseDto<String> deleteTicket(@RequestParam("ticketsId") String ticketsId) {
+        boolean result = ticketsPartnerService.deleteTicket(ticketsId);
+        if (!result) {
+            return ResponseDto.failure("删除票务失败");
+        } else {
+            return ResponseDto.success("删除成功");
+        }
+    }
+
+    @PostMapping(value = "/copy")
+    @ApiOperation(value = "复制票务")
+    @ApiResponse(response = TicketVo.class, code = 200, message = "接口返回对象参数")
+    public ResponseDto<TicketVo> copyTicket(@RequestParam("ticketsId") String ticketsId) {
+        TicketVo result = null;
+        result = ticketsPartnerService.copyTicket(ticketsId);
+        if (null == result) {
+            return ResponseDto.failure("复制票务失败");
+        } else {
+            return ResponseDto.success(result);
+        }
+    }
 }

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

 package com.liquidnet.service.kylin.service.impl.partner;
 
+import com.alibaba.fastjson.JSON;
 import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.liquidnet.common.cache.redis.util.RedisUtil;
@@ -8,10 +9,7 @@ import com.liquidnet.commons.lang.util.JsonUtils;
 import com.liquidnet.service.kylin.constant.KylinRedisConst;
 import com.liquidnet.service.kylin.dto.param.TicketCreateParam;
 import com.liquidnet.service.kylin.dto.vo.TicketVo;
-import com.liquidnet.service.kylin.entity.KylinFieldStatus;
-import com.liquidnet.service.kylin.entity.KylinTicketRelations;
-import com.liquidnet.service.kylin.entity.KylinTicketStatus;
-import com.liquidnet.service.kylin.entity.KylinTickets;
+import com.liquidnet.service.kylin.entity.*;
 import com.liquidnet.service.kylin.mapper.KylinTicketRelationsMapper;
 import com.liquidnet.service.kylin.mapper.KylinTicketStatusMapper;
 import com.liquidnet.service.kylin.mapper.KylinTicketsMapper;
@@ -72,9 +70,9 @@ public class KylinTicketsPartnerServiceImpl extends ServiceImpl<KylinTicketsMapp
         ticketCreateParam.setTicketsId(ticketsId);
 
         // mysql 操作
-        ticketsMapper.insert(ticketCreateParam.kylinTickets(ticketsId, createdAt));
-        ticketStatusMapper.insert(ticketCreateParam.kylinTicketStatus(ticketsId, createdAt));
-        ticketRelationsMapper.insert(ticketCreateParam.kylinTicketRelations(ticketsId, createdAt));
+        ticketsMapper.insert(ticketCreateParam.kylinTickets(ticketsId, createdAt, null));
+        ticketStatusMapper.insert(ticketCreateParam.kylinTicketStatus(ticketsId, createdAt, null));
+        ticketRelationsMapper.insert(ticketCreateParam.kylinTicketRelations(ticketsId, createdAt, null));
 
         // mongo 操作
         TicketVo ticketVo = new TicketVo();
@@ -96,8 +94,39 @@ public class KylinTicketsPartnerServiceImpl extends ServiceImpl<KylinTicketsMapp
 
     @Override
     public TicketVo updateTicket(TicketCreateParam ticketCreateParam) {
+        try {
+            String ticketId = ticketCreateParam.getTicketsId();
+            LocalDateTime updatedAt = LocalDateTime.now();
+            // mysql 操作
+            KylinTickets tickets = ticketCreateParam.kylinTickets(ticketId, null, updatedAt);
+            tickets.setUpdatedAt(updatedAt);
+            ticketsMapper.update(tickets
+                    , new UpdateWrapper<KylinTickets>().eq("tickets_id", ticketId));
+
+            // mongo 操作
+            TicketVo ticketVo = new TicketVo();
+            BeanUtils.copyProperties(ticketCreateParam, ticketVo);
+            ticketVo.setUpdatedAt(updatedAt.format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")));
+            ticketVo.setTimeEndExpress(ticketCreateParam.getTimeEndExpress().format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")));
+            ticketVo.setTimeStart(ticketCreateParam.getTimeStart().format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")));
+            ticketVo.setTimeEnd(ticketCreateParam.getTimeEnd().format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")));
+            ticketVo.setQrCodeShowTime(ticketCreateParam.getQrCodeShowTime().format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")));
+
+            BasicDBObject object = new BasicDBObject("$set", JSON.parse(JsonUtils.toJson(ticketVo)));
+            Document doc = mongoTemplate.getCollection(TicketVo.class.getSimpleName()).findOneAndUpdate(
+                    Query.query(Criteria.where("ticketsId").is(ticketId)).getQueryObject(),
+                    object,
+                    new FindOneAndUpdateOptions().returnDocument(ReturnDocument.AFTER)
+            );
+
+            // redis 操作
+            TicketVo ticketVoData = JsonUtils.fromJson(doc.toJson(), TicketVo.class);
+            redisUtil.hset(KylinRedisConst.TICKET, ticketId, ticketVoData);
+            return ticketVoData;
+        } catch (Exception e) {
             return null;
         }
+    }
 
     @Override
     public boolean deleteTicket(String ticketsId) {