Merge branch 'dev_merchant' into dev_merchant_tice

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

@@ -71,7 +71,6 @@ public class PerformanceStep1Param implements Serializable {
     private String details;
 
     @ApiModelProperty(value = "演出批文地址", example = "这是一个演出批文地址")
-    @NotNull(message = "演出批文地址不能为空")
     private String approvalUrl;
 
     @ApiModelProperty(value = "待支付时间", example = "5")

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

@@ -12,7 +12,6 @@ import lombok.Data;
 
 import java.math.BigDecimal;
 import java.time.LocalDateTime;
-import java.time.format.DateTimeFormatter;
 import java.util.List;
 
 @ApiModel
@@ -63,7 +62,6 @@ public class KylinPerformanceVo {
     private String projectId;
     @ApiModelProperty(value = "巡演id")
     private String roadShowId;
-
     // OSS
     @ApiModelProperty(value = "演出详情")
     private String details;
@@ -75,6 +73,8 @@ public class KylinPerformanceVo {
     private Integer isRecommend;
     @ApiModelProperty(value = "状态")
     private Integer appStatus;
+    @ApiModelProperty(value = "状态 [1正常|2非正常]")
+    private Integer status_sell;
     @ApiModelProperty(value = "是否可买")
     private Integer statusSell;
     @ApiModelProperty(value = "是否关联会员")
@@ -140,6 +140,11 @@ public class KylinPerformanceVo {
         this.notice = performance.getNotice();
         this.approvalUrl = performance.getApprovalUrl();
         this.rejectTxt = performance.getRejectTxt();
+        if (performance.getApprovalUrl() == null || performance.getApprovalUrl().isEmpty()) {
+            this.status_sell = 0;
+        } else {
+            this.status_sell = 1;
+        }
     }
 
     public void setTimePriceVipAndLack(int isLackRegister, int isMember, int isExclusive, BigDecimal price, LocalDateTime stopSellTime, LocalDateTime sellMemberTime, LocalDateTime sellTime, int isAdvance, int isDiscount, int payCountdownMinute) {

liquidnet-bus-api/liquidnet-service-kylin-api/src/main/java/com/liquidnet/service/kylin/dto/vo/partner/KylinTicketExpressModuleVo.java

@@ -12,8 +12,8 @@ public class KylinTicketExpressModuleVo implements Serializable, Cloneable {
     @ApiModelProperty(value = "票id")
     private String ticketId;
 
-    @ApiModelProperty(value = "快递模板id")
-    private List<String> expressModuleIdList;
+    @ApiModelProperty(value = "快递模板codeList")
+    private List<String> produceCodeList;
 
     private static final KylinTicketExpressModuleVo obj = new KylinTicketExpressModuleVo();
 

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

 package com.liquidnet.client.admin.zhengzai.kylin.service.impl;
 
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
@@ -23,6 +24,7 @@ import com.liquidnet.service.kylin.dto.vo.partner.TicketTimesTicketCreatePartner
 import com.liquidnet.service.kylin.entity.*;
 import com.liquidnet.service.kylin.mapper.*;
 import com.liquidnet.service.kylin.service.admin.IKylinPerformancesAdminService;
+import com.liquidnet.service.merchant.service.IMerchantAuthorizationRecordsService;
 import com.mongodb.BasicDBObject;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -57,36 +59,28 @@ public class KylinPerformancesAdminServiceImpl extends ServiceImpl<KylinPerforma
 
     @Autowired
     MongoTemplate mongoTemplate;
-
     @Autowired
     private MongoConverter mongoConverter;
-
     @Autowired
     private PerformanceVoUtils performanceVoUtils;
-
     @Autowired
     private DataUtils dataUtils;
-
     @Autowired
     private KylinPerformancesMapper performancesMapper;
-
     @Autowired
     private KylinPerformanceStatusMapper performanceStatusMapper;
-
     @Autowired
     private KylinPerformanceRelationsMapper performanceRelationsMapper;
-
     @Autowired
     private KylinTicketsMapper ticketsMapper;
-
     @Autowired
     private KylinTicketStatusMapper ticketStatusMapper;
-
     @Autowired
     private KylinOrderTicketsMapper kylinOrderTicketsMapper;
-
     @Autowired
     private KylinOrderImportMapper orderImportMapper;
+    @Autowired
+    IMerchantAuthorizationRecordsService merchantAuthorizationRecordsService;
 
     @Override
     public KylinPerformanceMisVo performanceDetails(String performancesId) {
@@ -149,6 +143,10 @@ public class KylinPerformancesAdminServiceImpl extends ServiceImpl<KylinPerforma
                         }
                     }
                     performanceVoUtils.performanceVoStatus(performancesId);
+                    //权限
+                    KylinPerformances data = performancesMapper.selectOne(new QueryWrapper<KylinPerformances>().in("performances_id", performancesId));
+                    KylinPerformanceRelations relationData = performanceRelationsMapper.selectOne(new QueryWrapper<KylinPerformanceRelations>().in("performance_id", performancesId));
+                    merchantAuthorizationRecordsService.authorizationInit(performancesId, relationData.getMerchantId(), relationData.getFieldId(), data.getSponsorId());
                 } else { //只修改演出相关 场次 票 (不包括 库存 售卖时间 限购)
                     log.info(" PERFORMANCE  演出审核 修改");
 
@@ -162,8 +160,11 @@ public class KylinPerformancesAdminServiceImpl extends ServiceImpl<KylinPerforma
 //                    }
                     delOrderTicketsRedis(vo);
                 }
-
                 dataUtils.delPerformanceRedis(performancesId);
+                //权限
+                KylinPerformances data = performancesMapper.selectOne(new QueryWrapper<KylinPerformances>().in("performances_id", performancesId));
+                KylinPerformanceRelations relationData = performanceRelationsMapper.selectOne(new QueryWrapper<KylinPerformanceRelations>().in("performance_id", performancesId));
+                merchantAuthorizationRecordsService.authorizationInit(performancesId, relationData.getMerchantId(), relationData.getFieldId(), data.getSponsorId());
             } else if (status == 4) {
                 log.info(" PERFORMANCE  演出审核 拒绝");
                 auditStatus = 2;

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

@@ -275,6 +275,12 @@ public class PerformanceVoUtils {
             performanceRelations.setUpdatedAt(updatedAt);
             performanceRelations.setMerchantId(null);
 
+            if(performances.getApprovalUrl()==null || performances.getApprovalUrl().equals("")){
+                performanceStatus.setStatusSell(0);
+            }else{
+                performanceStatus.setStatusSell(1);
+            }
+
             performancesMapper.update(performances, new UpdateWrapper<KylinPerformances>().eq("performances_id", performances.getPerformancesId()));
             performanceStatusMapper.update(performanceStatus, new UpdateWrapper<KylinPerformanceStatus>().eq("performance_id", performances.getPerformancesId()));
             performanceRelationsMapper.update(performanceRelations, new UpdateWrapper<KylinPerformanceRelations>().eq("performance_id", performances.getPerformancesId()));

liquidnet-bus-service/liquidnet-service-merchant/liquidnet-service-merchant-impl/docu/db_merchant.sql

@@ -264,7 +264,7 @@ create table kylin_ticket_express_module
 (
     mid        bigint unsigned auto_increment primary key,
     ticket_id  varchar(64) default '' comment '票种id',
-    express_module_id  varchar(64) default '' comment '快递模板id',
+    produce_code  varchar(64) default '' comment '快递模板code',
     created_at datetime ,
     updated_at datetime ,
     comment    text

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

 package com.liquidnet.service.merchant.service.impl;
 
-import com.baomidou.mybatisplus.core.toolkit.Wrappers;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
 import com.liquidnet.commons.lang.util.*;
@@ -379,13 +377,13 @@ public class KylinPerformancesPartnerServiceImpl implements IKylinPerformancesPa
                             KylinTicketExpressModuleVo moduleVo = redisMerchantUtils.getTEMPVo(ticketItem.getTicketsId());
                             redisMerchantUtils.setTEMVo(ticketItem.getTicketsId(), moduleVo);
                             sqlsDataE.add(new Object[]{ticketItem.getTicketsId()});
-                            for (String mVo:moduleVo.getExpressModuleIdList())
+                            for (String mVo : moduleVo.getProduceCodeList())
                                 sqlsDataF.add(new Object[]{
-                                        ticketItem.getTicketsId(),mVo,now,now
+                                        ticketItem.getTicketsId(), mVo, now, now
                                 });
                         }
                     }
-                    String sqlData = SqlMapping.gets(sqls, sqlsDataA, sqlsDataB, sqlsDataC, sqlsDataD,sqlsDataE,sqlsDataF);
+                    String sqlData = SqlMapping.gets(sqls, sqlsDataA, sqlsDataB, sqlsDataC, sqlsDataD, sqlsDataE, sqlsDataF);
                     queueUtil.sendMsgByRedis(MQConst.MerchantQueue.SQL_MERCHANT_STEP2.getKey(),
                             sqlData);
 

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

 package com.liquidnet.service.merchant.service.impl;
 
-import com.baomidou.mybatisplus.core.toolkit.Wrappers;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.liquidnet.commons.lang.util.*;
 import com.liquidnet.service.base.ErrorMapping;
 import com.liquidnet.service.base.ResponseDto;
@@ -16,22 +14,15 @@ import com.liquidnet.service.kylin.dto.vo.mongo.KylinPerformanceVo;
 import com.liquidnet.service.kylin.dto.vo.partner.KylinTicketExpressModuleVo;
 import com.liquidnet.service.kylin.dto.vo.partner.KylinTicketPartnerVo;
 import com.liquidnet.service.kylin.dto.vo.partner.KylinTicketTimesPartnerVo;
-import com.liquidnet.service.kylin.entity.*;
-import com.liquidnet.service.kylin.mapper.*;
 import com.liquidnet.service.kylin.service.partner.IKylinTicketsPartnerService;
 import com.liquidnet.service.merchant.util.*;
-import com.mongodb.BasicDBObject;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.data.mongodb.core.query.Criteria;
-import org.springframework.data.mongodb.core.query.Query;
 import org.springframework.stereotype.Service;
 
 import java.time.LocalDateTime;
 import java.time.format.DateTimeFormatter;
-import java.util.HashMap;
-import java.util.LinkedList;
 import java.util.List;
 
 /**
@@ -431,7 +422,7 @@ public class KylinTicketsPartnerServiceImpl implements IKylinTicketsPartnerServi
             }
             KylinTicketExpressModuleVo expressModuleVo = KylinTicketExpressModuleVo.getNew();
             expressModuleVo.setTicketId(ticketId);
-            expressModuleVo.setExpressModuleIdList(expressModuleIdList);
+            expressModuleVo.setProduceCodeList(expressModuleIdList);
             redisMerchantUtils.setTEMPVo(ticketId, expressModuleVo);
         }
         return true;

liquidnet-bus-service/liquidnet-service-merchant/liquidnet-service-merchant-impl/src/main/java/com/liquidnet/service/merchant/util/PerformanceUtils.java

 package com.liquidnet.service.merchant.util;
 
-import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
 import com.liquidnet.commons.lang.util.*;
 import com.liquidnet.service.base.SqlMapping;
 import com.liquidnet.service.base.constant.MQConst;
@@ -13,15 +12,10 @@ import com.liquidnet.service.kylin.entity.*;
 import com.liquidnet.service.kylin.service.partner.IKylinTicketTimesPartnerService;
 import com.liquidnet.service.kylin.service.partner.IKylinTicketsPartnerService;
 import com.liquidnet.service.merchant.dto.vo.MerchantFieldsVo;
-import com.mongodb.BasicDBObject;
-import com.mongodb.client.model.FindOneAndUpdateOptions;
-import com.mongodb.client.model.ReturnDocument;
 import lombok.extern.slf4j.Slf4j;
 import org.bson.Document;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.data.mongodb.core.query.Criteria;
-import org.springframework.data.mongodb.core.query.Query;
 import org.springframework.stereotype.Component;
 
 import java.math.BigDecimal;
@@ -280,8 +274,12 @@ public class PerformanceUtils {
             performanceStatus.setCreatedAt(performances.getCreatedAt());
             performanceStatus.setAuditStatus(0);
             performanceStatus.setUpdatedAt(updatedAt);
-
             performanceStatus.setLimitCountMember(1);
+            if(performances.getApprovalUrl()==null || performances.getApprovalUrl().equals("")){
+                performanceStatus.setStatusSell(0);
+            }else{
+                performanceStatus.setStatusSell(1);
+            }
 
             performanceRelations.setPerformanceId(performances.getPerformancesId());
             performanceRelations.setPerformanceRelationsId(IDGenerator.nextSnowId());
@@ -390,7 +388,7 @@ public class PerformanceUtils {
                     KylinTicketExpressModuleVo moduleVo = redisMerchantUtils.getTEMPVo(tickets.getTicketsId());
                     redisMerchantUtils.setTEMVo(tickets.getTicketsId(), moduleVo);
                     del9.add(new Object[]{tickets.getTicketsId()});
-                    for (String mVo:moduleVo.getExpressModuleIdList())
+                    for (String mVo:moduleVo.getProduceCodeList())
                     insert9.add(new Object[]{
                             tickets.getTicketsId(),mVo,updatedAt,updatedAt
                     });

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

@@ -583,8 +583,9 @@ public class KylinOrderTicketsServiceImpl implements IKylinOrderTicketsOrderServ
                 httpData.add("showUrl", payOrderParam.getShowUrl() + orderTicketId);
                 httpData.add("returnUrl", payOrderParam.getReturnUrl() + orderTicketId);
             }
+            log.debug("调用 DRAGON 参数 = " + httpData.toString());
             String returnData = HttpUtil.post(payUrl, httpData);
-            log.info("调用 DRAGON 结果 = " + returnData);
+            log.debug("调用 DRAGON 结果 = " + returnData);
             payResultVo = JsonUtils.fromJson(returnData, PayResultVo.class);
             payResultVo.getData().setOrderId(orderTicketId);
             payResultVo.getData().setPrice(orderTickets.getPriceActual());