Merge branch 'pre' into 'master'

Pre

See merge request !345

liquidnet-bus-api/liquidnet-service-kylin-api/src/main/java/com/liquidnet/service/kylin/dto/vo/ticketSystem/RefundOrderVo.java

 package com.liquidnet.service.kylin.dto.vo.ticketSystem;
 
+import com.liquidnet.service.kylin.dto.param.ticketSystem.STInsertFieldParam;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
@@ -8,7 +9,7 @@ import java.io.Serializable;
 
 @Data
 @ApiModel
-public class RefundOrderVo implements Serializable {
+public class RefundOrderVo implements Serializable,Cloneable {
     private static final long serialVersionUID = 4073256621782131607L;
     @ApiModelProperty(value = "票单id [必传]")
     private String ticketOrderId;
@@ -19,4 +20,14 @@ public class RefundOrderVo implements Serializable {
     @ApiModelProperty(value = "退票金额[必传 单位分]")
     private String refundAmount;
 
+    private static final RefundOrderVo obj = new RefundOrderVo();
+
+    public static RefundOrderVo getNew() {
+        try {
+            return (RefundOrderVo) obj.clone();
+        } catch (CloneNotSupportedException e) {
+            e.printStackTrace();
+        }
+        return new RefundOrderVo();
+    }
 }

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

@@ -26,6 +26,20 @@ public interface IKylinPerformancesAdminService {
 
     void test();
 
+    /**
+     * 同步演出 到票务平台
+     * @param performanceId 演出id
+     * @return 结果
+     */
+    boolean syncTicketSysPerformance(String performanceId);
+
+    /**
+     * 同步订单 到票务平台
+     * @param performanceId 演出id
+     * @return 结果
+     */
+    boolean syncTicketSysOrder(String performanceId);
+
     /**
      * 获取演出详情
      *

liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-web/src/main/java/com/liquidnet/client/admin/web/controller/zhengzai/kylin/KylinPerformancesController.java

@@ -58,6 +58,22 @@ public class KylinPerformancesController extends BaseController {
         kylinPerformancesService.test();
     }
 
+    @Log(title = "同步票务平台-演出", businessType = BusinessType.OTHER)
+    @PostMapping(value = "/syncTicketSysPerformance")
+    @ResponseBody
+    public AjaxResult syncTicketSysPerformance(@RequestParam("performancesId") String performancesId) {
+        boolean result = kylinPerformancesService.syncTicketSysPerformance(performancesId);
+        return toAjax(result);
+    }
+
+    @Log(title = "同步票务平台-订单", businessType = BusinessType.OTHER)
+    @PostMapping(value = "/syncTicketSysOrder")
+    @ResponseBody
+    public AjaxResult syncTicketSysOrder(@RequestParam("performancesId") String performancesId) {
+        boolean result = kylinPerformancesService.syncTicketSysOrder(performancesId);
+        return toAjax(result);
+    }
+
     /**
      * 查询演出列表
      */

liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-web/src/main/resources/templates/zhengzai/kylin/performances/details.html

@@ -66,6 +66,17 @@
                                 </button>
                             </div>
                         </div>
+                        <div class="panel-body" id="performance_platform">
+                            <strong>同步票务平台</strong>
+                            <div th:width="max" style="margin-top: 10px">
+                                <button type="button" class="btn btn-w-m btn-success" name="synPerform"
+                                        onclick="synPerform()">同步演出
+                                </button>
+                                <button type="button" class="btn btn-w-m btn-success" name="synOrder"
+                                        onclick="synOrder()">同步订单
+                                </button>
+                            </div>
+                        </div>
                         <div class="panel-body" th:width="max" style="margin-top: 10px">
                             <form class="form-horizontal m" id="form-performances-edit"
                                   th:object="${kylinPerformanceMisVo}">
@@ -334,7 +345,27 @@
     var prefix = ctx + "kylin/performances"
     const isShow = '[[${kylinPerformanceMisVo.isShow}]]';
     const auditStatus = '[[${kylinPerformanceMisVo.auditStatus}]]';
+    const status = '[[${kylinPerformanceMisVo.status}]]';
     const fieldStatus = '[[${kylinPerformanceMisVo.fieldAuditStatus}]]';
+    const endTime = new Date('[[${kylinPerformanceMisVo.timeEnd}]]'.replaceAll("\"", "")).valueOf();
+    const now = new Date().valueOf();
+    // const et = new Date(endTime.replaceAll("\"", "")).valueOf();
+    //获取当前时间
+    function FormatDate() {
+        var now = new Date();
+        var year = now.getFullYear();
+        var month = now.getMonth();
+        var date = now.getDate();
+        month = month + 1;
+        if (month < 10) {
+            month = "0" + month;
+        }
+        if (date < 10) {
+            date = "0" + date;
+        }
+        var time = year + "-" + month + "-" + date;
+        return time;
+    }
 
     var agentFlag = [[${@permission.hasPermi('kylin:performances:agent')}]];
     if (agentFlag == "hidden") {
@@ -391,6 +422,11 @@
     } else {
         document.getElementsByName("isShowCheck")[1].checked = true;
     }
+    if (now > endTime && status>3 && status!=7) {
+        // document.getElementById("performance_platform").style.display = "none";
+    } else {
+        document.getElementById("performance_platform").style.display = "none";
+    }
 
     //修改 演出是否显示
     function submitHandler() {
@@ -402,6 +438,23 @@
         });
     }
 
+    //同步票务平台
+    function synPerform() {
+        var param = {
+            "performancesId": '[[${kylinPerformanceMisVo.performancesId}]]'.replaceAll("\"", "")
+        };
+        $.operate.post(prefix + "/syncTicketSysPerformance/", param, function (res) {
+        });
+    }
+
+    function synOrder() {
+        var param = {
+            "performancesId": '[[${kylinPerformanceMisVo.performancesId}]]'.replaceAll("\"", "")
+        };
+        $.operate.post(prefix + "/syncTicketSysOrder/", param, function (res) {
+        });
+    }
+
     //演出审核
     function aduitHandler() {
         const auditStatus = document.getElementsByName("auditCheck")[0].checked ? 3 : 4;

liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-web/src/main/resources/templates/zhengzai/smile/smileTickets/list.html

@@ -119,6 +119,14 @@
                     field: 'cityName',
                     title: '城市'
                 },
+                {
+                    field: 'timeStart',
+                    title: '演出开始时间'
+                },
+                {
+                    field: 'timeEnd',
+                    title: '演出结束时间'
+                },
                 {
                     field: 'open',
                     title: '总销售数量'

liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-zhengzai/src/main/java/com/liquidnet/client/admin/zhengzai/goblin/utils/GoblinObjectUtils.java

 package com.liquidnet.client.admin.zhengzai.goblin.utils;
 
+import com.liquidnet.service.kylin.dto.vo.ticketSystem.OrderVo;
+import com.liquidnet.service.stone.vo.StoneItemListVo;
+import com.liquidnet.service.stone.vo.StoneOrderListVo;
 import com.mongodb.BasicDBObject;
 
+import java.util.ArrayList;
+
 public class GoblinObjectUtils {
     private static final BasicDBObject basicDBObject = new BasicDBObject();
+    private static final ArrayList<OrderVo> orderVo = new ArrayList<>();
+
+    public static ArrayList<OrderVo> orderVo() {
+        return (ArrayList<OrderVo>) orderVo.clone();
+    }
 
     public static BasicDBObject cloneBasicDBObject() {
         return (BasicDBObject) basicDBObject.clone();

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

@@ -3,6 +3,7 @@ package com.liquidnet.client.admin.zhengzai.kylin.service;
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
 import com.fasterxml.jackson.core.type.TypeReference;
+import com.liquidnet.client.admin.zhengzai.goblin.utils.GoblinObjectUtils;
 import com.liquidnet.client.admin.zhengzai.kylin.utils.DataUtils;
 import com.liquidnet.common.cache.redis.util.RedisDataSourceUtil;
 import com.liquidnet.commons.lang.util.CollectionUtil;
@@ -13,9 +14,12 @@ import com.liquidnet.service.kylin.constant.KylinRedisConst;
 import com.liquidnet.service.kylin.dto.param.ticketSystem.*;
 import com.liquidnet.service.kylin.dto.vo.middle.KylinTicketTimesVo;
 import com.liquidnet.service.kylin.dto.vo.middle.KylinTicketVo;
+import com.liquidnet.service.kylin.dto.vo.mongo.KylinOrderTicketEntitiesVo;
+import com.liquidnet.service.kylin.dto.vo.mongo.KylinOrderTicketVo;
 import com.liquidnet.service.kylin.dto.vo.mongo.KylinPerformanceVo;
 import com.liquidnet.service.kylin.dto.vo.ticketSystem.*;
 import com.liquidnet.service.slime.dto.vo.SlimeFieldsVo;
+import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;
@@ -31,10 +35,12 @@ import java.util.List;
 import static com.liquidnet.commons.lang.util.DateUtil.DTF_YMD_HMS;
 
 @Service
+@Slf4j
 public class InnerService {
 
     @Value("${liquidnet.service.platform.url}")
-    private String platform ;
+    private String platform;
+    //    private String platform = "http://127.0.0.1:9003";
     @Autowired
     RedisDataSourceUtil redisDataSourceUtil;
     @Autowired
@@ -86,14 +92,14 @@ public class InnerService {
     }
 
     //修改上报的演出项目数据
-    public boolean updateP(KylinTicketTimesVo vo, String performanceId, String sessionCode) {
+    public boolean updateP(KylinTicketTimesVo vo, String performanceId, String fieldId) {
         STUpdateTimesParam updateTimesParam = STUpdateTimesParam.getNew();
         updateTimesParam.setSessionId(vo.getTicketTimesId());
-        updateTimesParam.setSessionCode(sessionCode);
+        updateTimesParam.setSessionCode(getSessionCode(vo.getTicketTimesId()));
         updateTimesParam.setSessionName(vo.getTitle());
         updateTimesParam.setSessionStartTime(LocalDateTime.parse(vo.getUseStart(), DTF_YMD_HMS));
         updateTimesParam.setSessionEndTime(LocalDateTime.parse(vo.getUseEnd(), DTF_YMD_HMS));
-        updateTimesParam.setHallCode("320412009");//TODO
+        updateTimesParam.setHallCode(getVenueCode(getVenueCode(fieldId)));
         updateTimesParam.setHasSeat(0);
         updateTimesParam.setPerformanceId(performanceId);
         updateTimesParam.setSessionStatus(1);
@@ -176,19 +182,19 @@ public class InnerService {
         try {
             MultiValueMap<String, String> headers = CollectionUtil.linkedMultiValueMapStringString();
             headers.add("Accept", "application/json;charset=UTF-8");
-            HashMap<String, String> params = CollectionUtil.mapStringString();
-            params.put("provinceId", vo.getProvinceId());
-            params.put("cityId", vo.getCityId());
-            params.put("districtId", vo.getDistrictId());
-            params.put("pageNo", "1");
-            params.put("pageSize", "40");
-            params.put("venueName", vo.getName());
-            String json = HttpUtil.getRaw(platform + "/platform/st/field/list?provinceId={provinceId}&cityId={cityId}&districtId={districtId}&pageNo={pageNo}&pageSize={pageSize}&venueName={venueName}", JSON.toJSONString(params), headers);
+            MultiValueMap<String, String> params = CollectionUtil.linkedMultiValueMapStringString();
+            params.add("provinceId", vo.getProvinceId());
+            params.add("cityId", vo.getCityId());
+            params.add("districtId", vo.getDistrictId());
+            params.add("pageNo", "1");
+            params.add("pageSize", "40");
+            params.add("venueName", vo.getName());
+            String json = HttpUtil.post(platform + "/platform/st/field/list", params, headers);
             ResponseDataVo<List<STFieldListVo>> response =
                     JsonUtils.fromJson(json, new TypeReference<ResponseDataVo<List<STFieldListVo>>>() {
                     });
             STInsertFieldParam insertTicketParam = STInsertFieldParam.getNew();
-            if (response.getData() != null && response.getData().size() == 1) {
+            if (response.getData() != null && response.getData().size() >= 1) {
                 STFieldListVo innerVo = response.getData().get(0);
                 setVenueCode(vo.getFieldId(), innerVo.getVenueCode());
                 return true;
@@ -214,6 +220,83 @@ public class InnerService {
                 return true;
             }
         } catch (Exception e) {
+            e.printStackTrace();
+            return false;
+        }
+    }
+
+    //退款订单 todo 需要结合退款接口处理
+    public boolean reportRefund(String orderId, String refundOrderId, String reason) {
+        MultiValueMap<String, String> headers = CollectionUtil.linkedMultiValueMapStringString();
+        headers.add("Accept", "application/json;charset=UTF-8");
+        KylinOrderTicketVo orderTicketVo = dataUtils.getOrderTicketVo(orderId);
+        STRefundOrderParam param = STRefundOrderParam.getNew();
+        param.setOrderId(orderId);
+        param.setReason(reason);
+        param.setRefundOrderId(refundOrderId);
+        param.setRefundOrderTime(LocalDateTime.now());
+        List<RefundOrderVo> refundOrderVos = new ArrayList();
+        for (KylinOrderTicketEntitiesVo entitiesVo : orderTicketVo.getEntitiesVoList()) {
+            RefundOrderVo refundOrderVo = RefundOrderVo.getNew();
+            refundOrderVo.setRefundAmount(entitiesVo.getRefundPrice().multiply(BigDecimal.valueOf(100)).toString());
+            refundOrderVo.setSessionCode(getSessionCode(entitiesVo.getTimeId()));
+            refundOrderVo.setTicketId(entitiesVo.getTicketId());
+            refundOrderVo.setTicketOrderId(entitiesVo.getOrderTicketEntitiesId());
+            refundOrderVos.add(refundOrderVo);
+        }
+        param.setTicketOrderList(refundOrderVos);
+
+        String resultData = HttpUtil.postRaw(platform + "/platform/st/order/refund", JSON.toJSONString(param), headers);
+        ResponseDto<Boolean> innerReturnVo = JsonUtils.fromJson(resultData, new TypeReference<ResponseDto<Boolean>>() {
+        });
+        return innerReturnVo.getData();
+    }
+
+    //上报订单
+    public boolean reportO(KylinOrderTicketVo vo, String channelName) {
+        try {
+            if (vo.getStatus() == 2 || vo.getStatus() == 4) {
+                log.info("订单状态 不需要同步");
+                return false;
+            }
+            STInsertOrderParam insertOrderParam = STInsertOrderParam.getNew();
+            insertOrderParam.setOrderId(vo.getOrderTicketsId());
+            insertOrderParam.setOrderTime(vo.getTimePay());
+            insertOrderParam.setChannelType(1);
+            insertOrderParam.setChannelName(channelName);
+            insertOrderParam.setTicketNum(vo.getNumber());
+            insertOrderParam.setTotalAmount(vo.getPriceActual().multiply(BigDecimal.valueOf(100)).intValue());
+            insertOrderParam.setTicketType(1);
+            insertOrderParam.setTicketMode(vo.getGetTicketType().equalsIgnoreCase("express") ? 1 : 2);
+            insertOrderParam.setAuthMode(dataUtils.getPerformanceIsTrueName(vo.getPerformanceId()) == 1 ? 3 : 1);
+            int voucherPrice = vo.getPriceVoucher().multiply(BigDecimal.valueOf(100)).divide(BigDecimal.valueOf(vo.getNumber())).intValue();
+            int refundPrice = vo.getPriceRefund().multiply(BigDecimal.valueOf(100)).intValue();
+            List<OrderVo> orderVos = GoblinObjectUtils.orderVo();
+            for (KylinOrderTicketEntitiesVo item : vo.getEntitiesVoList()) {
+                if (item.getIsPayment() == 0 || item.getIsPayment() == 3) {
+                    log.info("票单状态 不需要同步");
+                    continue;
+                }
+                OrderVo orderVo = OrderVo.getNew();
+                orderVo.setTicketOrderId(item.getOrderTicketEntitiesId());
+                orderVo.setPerformanceId(item.getPerformanceId());
+                orderVo.setSessionId(item.getTimeId());
+                orderVo.setSessionCode(getSessionCode(item.getTimeId()));
+                orderVo.setPriceId(getPriceId(item.getTicketId()));
+                orderVo.setTicketPrice((vo.getPrice().subtract(vo.getPriceRefund())).multiply(BigDecimal.valueOf(100)).intValue());
+                orderVo.setTicketId(item.getOrderTicketEntitiesId());
+                orderVo.setTicketOrderAmount(orderVo.getTicketPrice() - voucherPrice - refundPrice);
+                orderVos.add(orderVo);
+            }
+            insertOrderParam.setTicketOrderList(orderVos);
+            MultiValueMap<String, String> header = CollectionUtil.linkedMultiValueMapStringString();
+            header.add("Accept", "application/json;charset=UTF-8");
+            String resultData = HttpUtil.postRaw(platform + "/platform/st/order/insert", JSON.toJSONString(insertOrderParam), header);
+            ResponseDto<Boolean> innerReturnVo = JsonUtils.fromJson(resultData, new TypeReference<ResponseDto<Boolean>>() {
+            });
+            return innerReturnVo.getData();
+        } catch (Exception e) {
+            e.printStackTrace();
             return false;
         }
     }

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

@@ -14,6 +14,7 @@ import com.liquidnet.client.admin.zhengzai.kylin.utils.PerformanceVoUtils;
 import com.liquidnet.client.admin.zhengzai.slime.service.ISlimeAuthorizationRecordsAdminService;
 import com.liquidnet.client.admin.zhengzai.smile.utils.SmileRedisUtils;
 import com.liquidnet.commons.lang.util.BeanUtil;
+import com.liquidnet.commons.lang.util.CollectionUtil;
 import com.liquidnet.commons.lang.util.DateUtil;
 import com.liquidnet.service.goblin.dto.vo.SmileAgentVo;
 import com.liquidnet.service.kylin.constant.KylinRedisConst;
@@ -103,16 +104,54 @@ public class KylinPerformancesAdminServiceImpl extends ServiceImpl<KylinPerforma
     @Override
     public void test() {
 //        //同步演出
-        String performancesId = "324470932321198083852669";
-//        KylinPerformances data = performancesMapper.selectOne(new QueryWrapper<KylinPerformances>().in("performances_id", performancesId));
+        String performancesId = "2020170834697011205072651";
+        KylinPerformances data = performancesMapper.selectOne(new QueryWrapper<KylinPerformances>().in("performances_id", performancesId));
 //        KylinPerformanceRelations relationData = performanceRelationsMapper.selectOne(new QueryWrapper<KylinPerformanceRelations>().in("performance_id", performancesId));
-//        merchantAuthorizationRecordsAdminService.authorizationInit(performancesId, "484418569471385607065926", "528301618682265605017366", "528268445384048648038465");
-//        innerService.reportP(dataUtils.getPerformanceVo(performancesId),null,data.getSponsorId());
-//        //同步订单
-//        String orderId = "324561214127595525805856";
+        //同步场地
+//        innerService.reportField(dataUtils.getFieldsVoByFieldId(relationData.getFieldId()));
+//        同步演出
+        innerService.reportP(dataUtils.getPerformanceVo(performancesId), null, data.getSponsorId());
+        //退款订单
+//        String orderId = "2411921318065766408847583";
+//        innerService.reportRefund(orderId, "R" + orderId, "测试");
+        //同步订单
 //        innerService.reportO(dataUtils.getOrderTicketVo(orderId),"摩登天空");
+        log.info("SUCCESS");
+    }
 
-//        innerService.reportField(dataUtils.getFieldsVoByFieldId("7"));
+    @Override
+    public boolean syncTicketSysPerformance(String performanceId) {
+        //同步场地
+        KylinPerformanceRelations relationData = performanceRelationsMapper.selectOne(new QueryWrapper<KylinPerformanceRelations>().in("performance_id", performanceId));
+        boolean filedResult = innerService.reportField(dataUtils.getFieldsVoByFieldId(relationData.getFieldId()));
+        if (!filedResult) {
+            log.error("同步 场地 到票务平台 异常");
+            return filedResult;
+        }
+        //同步演出
+        KylinPerformances data = performancesMapper.selectOne(new QueryWrapper<KylinPerformances>().in("performances_id", performanceId));
+        List<String> sessionCodeList = innerService.reportP(dataUtils.getPerformanceVo(performanceId), null, data.getSponsorId());
+
+        if (!sessionCodeList.isEmpty()) {
+            return true;
+        }
+        log.error("同步 演出 到票务平台 异常");
+        return false;
+    }
+
+    @Override
+    public boolean syncTicketSysOrder(String performanceId) {
+        //查询演出下需要同步的订单id
+        List<String> orderIds = kylinOrderTicketsMapper.getPayOrderIds(performanceId);
+        boolean orderResult = true;
+        for (String orderId : orderIds) {
+            orderResult = innerService.reportO(dataUtils.getOrderTicketVo(orderId), "摩登天空");
+            if (!orderResult) {
+                log.error("同步 订单 到票务平台 异常 订单Id:{}", orderId);
+                break;
+            }
+        }
+        return orderResult;
     }
 
     @Override

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

@@ -149,9 +149,9 @@ liquidnet:
         nftPlatformMnemonic: person lucky trophy wall kangaroo body bounce coach unable sister second goat guitar virus tree security acoustic ankle kiss deputy sunny message weapon believe
         nftPlatformAddress: YqsYxgBSP74piDhNQHTjWMH9wXnXxZbt8
     other:
-      ticketSystemUrl: http://dev-report.capapiao.com
-      appId: 11920532
-      secret: 0854C2FFE6BED88E1E21E7F5BAF988CDF9D81D38
+      ticketSystemUrl: http://report.capapiao.com
+      appId: 59251758
+      secret: 0EBB54EB729A116500CFD9EA7BA38456CD122557
     slime:
       url: http://devslime.zhengzai.tv
     executor-main:

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

@@ -149,9 +149,9 @@ liquidnet:
         nftPlatformMnemonic: person lucky trophy wall kangaroo body bounce coach unable sister second goat guitar virus tree security acoustic ankle kiss deputy sunny message weapon believe
         nftPlatformAddress: YqsYxgBSP74piDhNQHTjWMH9wXnXxZbt8
     other:
-      ticketSystemUrl: http://dev-report.capapiao.com/
-      appId: 11920532
-      secret: 0854C2FFE6BED88E1E21E7F5BAF988CDF9D81D38
+      ticketSystemUrl: http://report.capapiao.com
+      appId: 59251758
+      secret: 0EBB54EB729A116500CFD9EA7BA38456CD122557
     slime:
       url: http://testslime.zhengzai.tv
     executor-main:

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

@@ -149,9 +149,9 @@ liquidnet:
         nftPlatformMnemonic: person lucky trophy wall kangaroo body bounce coach unable sister second goat guitar virus tree security acoustic ankle kiss deputy sunny message weapon believe
         nftPlatformAddress: YqsYxgBSP74piDhNQHTjWMH9wXnXxZbt8
     other:
-      ticketSystemUrl: http://dev-report.capapiao.com/
-      appId: 11920532
-      secret: 0854C2FFE6BED88E1E21E7F5BAF988CDF9D81D38
+      ticketSystemUrl: http://report.capapiao.com
+      appId: 59251758
+      secret: 0EBB54EB729A116500CFD9EA7BA38456CD122557
     slime:
       url: http://test2slime.zhengzai.tv
     executor-main:

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

@@ -149,9 +149,9 @@ liquidnet:
         nftPlatformMnemonic: person lucky trophy wall kangaroo body bounce coach unable sister second goat guitar virus tree security acoustic ankle kiss deputy sunny message weapon believe
         nftPlatformAddress: YqsYxgBSP74piDhNQHTjWMH9wXnXxZbt8
     other:
-      ticketSystemUrl: http://dev-report.capapiao.com/
-      appId: 11920532
-      secret: 0854C2FFE6BED88E1E21E7F5BAF988CDF9D81D38
+      ticketSystemUrl: http://report.capapiao.com
+      appId: 59251758
+      secret: 0EBB54EB729A116500CFD9EA7BA38456CD122557
     slime:
       url: http://ttestslime.zhengzai.tv
     executor-main:

liquidnet-bus-do/liquidnet-service-kylin-do/src/main/java/com/liquidnet/service/kylin/mapper/KylinOrderTicketsMapper.java

@@ -39,24 +39,26 @@ public interface KylinOrderTicketsMapper extends BaseMapper<KylinOrderTickets> {
 
     List<OrderExpressExportListDao> selectExpressList(@Param("performanceId") String performanceId);
 
+    List<String> getPayOrderIds(@Param("performanceId") String performanceId);
+
     /**
      * 根据用户id获取 演出订单维度 完成没任务次数
      * @param uid
      * @return
      */
     Integer getOrderScore(@Param("uid") String uid);
-    List<Map> getUserOrder(@Param("userId")String userId);
-    Map getUserCommission(@Param("agentId")String agentId);
-    List<Map> getUserSellOneDate(@Param("agentId")String agentId,@Param("performanceId")String performanceId);
-    Map getUserSellAllDate(@Param("agentId")String agentId,@Param("performanceId")String performanceId);
-    List<Map> getUserSellDetail(@Param("agentId")String agentId,@Param("ticketId")String ticketId);
-    List<Map> getUserPerformance(@Param("agentId")String userId);
+    List<Map> getUserOrder(@Param("userId") String userId);
+    Map getUserCommission(@Param("agentId") String agentId);
+    List<Map> getUserSellOneDate(@Param("agentId") String agentId, @Param("performanceId") String performanceId);
+    Map getUserSellAllDate(@Param("agentId") String agentId, @Param("performanceId") String performanceId);
+    List<Map> getUserSellDetail(@Param("agentId") String agentId, @Param("ticketId") String ticketId);
+    List<Map> getUserPerformance(@Param("agentId") String userId);
 
-    Map getUserPerformanceByUidAndProId(@Param("agentId")String userId,@Param("performanceId")String performanceId);
+    Map getUserPerformanceByUidAndProId(@Param("agentId") String userId, @Param("performanceId") String performanceId);
 
-    List<KylinOrderTicketAndAgentVo> selectListByPerformanceId(@Param("performancesId") String performancesId,@Param("ticketId")String ticketId);
+    List<KylinOrderTicketAndAgentVo> selectListByPerformanceId(@Param("performancesId") String performancesId, @Param("ticketId") String ticketId);
 
     List<String> getAgentIdListByPerId(@Param("performancesId") String performancesId);
 
-    Map selectNumAndPrice(@Param("performancesId") String performancesId,@Param("ticketsId") String ticketsId);
+    Map selectNumAndPrice(@Param("performancesId") String performancesId, @Param("ticketsId") String ticketsId);
 }

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

@@ -566,4 +566,15 @@
 	AND kk.performance_id = #{performancesId}
 	AND kk.ticket_id = #{ticketsId}
     </select>
+
+
+    <select id="getPayOrderIds" resultType="String">
+        SELECT order_tickets_id
+FROM kylin_order_tickets kot
+         INNER JOIN kylin_order_ticket_relations as kotr on kotr.order_id = kot.order_tickets_id
+         INNER JOIN kylin_order_ticket_status as kots on kots.order_id = kot.order_tickets_id
+WHERE kotr.performance_id = #{performanceId}
+  AND kots.status IN (1, 3, 6)
+  AND kots.transfer_status in (0, 1, 3, 5);
+    </select>
 </mapper>

liquidnet-bus-service/liquidnet-service-platform/liquidnet-service-platform-impl/src/main/java/com/liquidnet/service/platform/controller/ticketSystem/TicketSystemController.java

@@ -35,9 +35,9 @@ public class TicketSystemController {
         }
     }
 
-    @GetMapping("field/list")
+    @PostMapping("field/list")
     @ApiOperation("查询标准演出场所")
-    public ResponseDto<List<STFieldListVo>> getFieldList(@RequestBody STFieldListParam fieldListParam) {
+    public ResponseDto<List<STFieldListVo>> getFieldList( STFieldListParam fieldListParam) {
         try {
             String accessToken = ticketSystemService.getAccessToken();
             List<STFieldListVo> vo = ticketSystemService.getFieldList(accessToken, fieldListParam);