Merge branch 'dev' into test

liquidnet-bus-api/liquidnet-service-adam-api/src/main/java/com/liquidnet/service/adam/dto/vo/AdamMemberCodeVo.java

@@ -56,6 +56,7 @@ public class AdamMemberCodeVo implements Serializable, Cloneable {
     }
 
     public AdamMemberCodeVo copy(AdamMemberCode source) {
+        if (null == source) return this;
         this.setCode(source.getCode());
         this.setMemberId(source.getMemberId());
         this.setMemberPriceId(source.getMemberPriceId());

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

@@ -35,7 +35,7 @@ public interface IKylinOrderTicketsService extends IService<KylinOrderTickets> {
     // 同步大麦数据接口
 
     //订单列表(状态 待支付 已支付 倒计时 已失效)
-    PageInfo<List<KylinOrderListVo>> orderList(int page, int size);
+    PageInfo<List<KylinOrderListVo>> orderList();
 
     //订单详情
     OrderDetailsVo orderDetails(String orderId);

liquidnet-bus-service/liquidnet-service-adam/liquidnet-service-adam-impl/src/main/java/com/liquidnet/service/adam/service/impl/admin/AdamMemberCodeAdminServiceImpl.java

@@ -17,6 +17,8 @@ import org.springframework.data.mongodb.core.query.Query;
 import org.springframework.stereotype.Service;
 import org.springframework.util.StringUtils;
 
+import java.time.LocalDateTime;
+
 @Slf4j
 @Service
 public class AdamMemberCodeAdminServiceImpl extends ServiceImpl<AdamMemberCodeMapper, AdamMemberCode> implements IAdamMemberCodeAdminService {
@@ -52,6 +54,7 @@ public class AdamMemberCodeAdminServiceImpl extends ServiceImpl<AdamMemberCodeMa
         initMemberCode.setMemberPriceId(param.getMemberPriceId());
         initMemberCode.setMemberNo(memberNo);
         initMemberCode.setState(0);// 0-未使用,1-已使用,2-不可用
+        initMemberCode.setCreatedAt(LocalDateTime.now());
 
         adamMemberCodeMapper.insert(initMemberCode);
 

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

@@ -71,9 +71,8 @@ public class KylinOrderTicketsController {
     @GetMapping("list")
     @ApiOperation("订单列表")
     @ApiResponse(code = 200, message = "接口返回对象参数")
-    public ResponseDto<PageInfo<List<KylinOrderListVo>>> orderList(@RequestParam("page")  int page,
-                                                                  @RequestParam("size")  int size) {
-        return ResponseDto.success(orderTicketsService.orderList(page,size));
+    public ResponseDto<PageInfo<List<KylinOrderListVo>>> orderList() {
+        return ResponseDto.success(orderTicketsService.orderList());
     }
 
     @GetMapping("details")

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

@@ -118,9 +118,13 @@ public class KylinTicketsPartnerServiceImpl extends ServiceImpl<KylinTicketsMapp
             kylinTicketPartnerVo.setDefault();
             if(ticketCreateParam.getIsExpress()==1){
                 kylinTicketPartnerVo.setDescribesExpress(ticketCreateParam.getDescribesExpress());
+            }else{
+                kylinTicketPartnerVo.setDescribesExpress("");
             }
             if(ticketCreateParam.getIsElectronic()==1){
                 kylinTicketPartnerVo.setDescribeElectronic(ticketCreateParam.getDescribeElectronic());
+            }else{
+                kylinTicketPartnerVo.setDescribeElectronic("");
             }
 
             if (ticketCreateParam.getIsExpress() == 1) {
@@ -164,10 +168,15 @@ public class KylinTicketsPartnerServiceImpl extends ServiceImpl<KylinTicketsMapp
             kylinTicketPartnerVo.setType(kylinTicketTimesPartnerVo.getType());
             if(ticketCreateParam.getIsExpress()==1){
                 kylinTicketPartnerVo.setDescribesExpress(ticketCreateParam.getDescribesExpress());
+            }else{
+                kylinTicketPartnerVo.setDescribesExpress("");
             }
             if(ticketCreateParam.getIsElectronic()==1){
                 kylinTicketPartnerVo.setDescribeElectronic(ticketCreateParam.getDescribeElectronic());
+            }else{
+                kylinTicketPartnerVo.setDescribeElectronic("");
             }
+
             kylinTicketPartnerVo.setStatus(-2);
             kylinTicketPartnerVo.setDefault();
 
@@ -296,7 +305,7 @@ public class KylinTicketsPartnerServiceImpl extends ServiceImpl<KylinTicketsMapp
             LocalDateTime createdAt = LocalDateTime.now();
 
             PerformancePartnerVo performancePartnerVo = mongoTemplate.findOne(Query.query(Criteria.where("performancesId").is(performanceId)), PerformancePartnerVo.class, PerformancePartnerVo.class.getSimpleName());
-            if(performancePartnerVo.getAuditStatus()==0){
+            if(performancePartnerVo.getAuditStatus()==0 || performancePartnerVo.getAuditStatus()==1){
                 return ResponseDto.failure(ErrorMapping.get(20107));
             }