提交 admin 审核

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

@@ -18,4 +18,8 @@ public class PayAgainParam {
     private String deviceFrom;
     @ApiModelProperty(value = "openId")
     private String openId;
+    @ApiModelProperty(value = "showUrl")
+    private String showUrl;
+    @ApiModelProperty(value = "returnUrl")
+    private String returnUrl;
 }

liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-common/pom.xml

@@ -101,6 +101,17 @@
             <artifactId>javax.servlet-api</artifactId>
         </dependency>
 
+        <dependency>
+            <groupId>com.baomidou</groupId>
+            <artifactId>mybatis-plus-boot-starter</artifactId>
+            <version>3.4.0</version>
+        </dependency>
+        <dependency>
+            <groupId>com.baomidou</groupId>
+            <artifactId>mybatis-plus-generator</artifactId>
+            <version>3.4.0</version>
+        </dependency>
+
     </dependencies>
 
 </project>
\ No newline at end of file

liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-framework/src/main/java/com/liquidnet/client/admin/framework/config/MyBatisConfig.java

@@ -6,6 +6,8 @@ import java.util.Arrays;
 import java.util.HashSet;
 import java.util.List;
 import javax.sql.DataSource;
+
+import com.baomidou.mybatisplus.extension.spring.MybatisSqlSessionFactoryBean;
 import org.apache.ibatis.io.VFS;
 import org.apache.ibatis.session.SqlSessionFactory;
 import org.mybatis.spring.SqlSessionFactoryBean;
@@ -122,7 +124,7 @@ public class MyBatisConfig
         typeAliasesPackage = setTypeAliasesPackage(typeAliasesPackage);
         VFS.addImplClass(SpringBootVFS.class);
 
-        final SqlSessionFactoryBean sessionFactory = new SqlSessionFactoryBean();
+        final MybatisSqlSessionFactoryBean sessionFactory = new MybatisSqlSessionFactoryBean();
         sessionFactory.setDataSource(dataSource);
         sessionFactory.setTypeAliasesPackage(typeAliasesPackage);
         sessionFactory.setMapperLocations(resolveMapperLocations(StringUtils.split(mapperLocations, ",")));

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

@@ -56,11 +56,19 @@ public class KylinPerformancesController extends BaseController {
         return prefix + "/details";
     }
 
+    @PostMapping(value = "/audit")
+    @RequiresPermissions("kylin:performances:audit")
+    @ResponseBody
+    public AjaxResult performanceAudit(@RequestParam("performancesId") String performancesId, @RequestParam("status") int status, @RequestParam(value = "rejectTxt", required = false) String rejectTxt) {
+        boolean result = kylinPerformancesService.performanceAudit(performancesId, status, rejectTxt);
+        return toAjax(result);
+    }
+
     @RequiresPermissions("kylin:performances:change")
     @PostMapping(value = "/isShow")
     @ResponseBody
     public AjaxResult setIsShow(String performancesId, Integer isShow) {
-        return toAjax(kylinPerformancesService.setIsShow(performancesId,isShow));
+        return toAjax(kylinPerformancesService.setIsShow(performancesId, isShow));
     }
 
 //

liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-web/src/main/resources/application-dev.yml

@@ -36,13 +36,13 @@ spring:
       uri: mongodb://root:S&y$6d*JwJ@39.106.122.201:27017/?authSource=admin&waitQueueMultiple=100
       sslEnabled: false
       database: dev_ln_scene
-    redis:
-      port: 6379
-      host: 39.106.122.201
-      password: 3Xa%8p
-      lettuce:
-        pool:
-          max-active: 8
-          max-wait: -1
-          max-idle: 8
-          min-idle: 0
\ No newline at end of file
+  redis:
+    port: 6379
+    host: 39.106.122.201
+    password: 3Xa%8p
+    lettuce:
+      pool:
+        max-active: 8
+        max-wait: -1
+        max-idle: 8
+        min-idle: 0
\ No newline at end of file

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

@@ -112,6 +112,8 @@
 
                                 <div th:each="dict : ${kylinPerformanceMisVo.ticketTimes}">
                                     <div th:each="dict2 : ${dict.ticket}">
+                                        <br/>
+                                        <br/>
                                         <div>
                                             <span>票种名称：</span>
                                             <span th:text="${dict2.title}"></span>
@@ -130,14 +132,14 @@
                                             <span>票种说明：</span>
                                             <span th:text="${dict2.title}"></span>
                                         </div>
-                                        <div>
-                                            <span>电子票说明：</span>
-                                            <span th:text="${dict2.title}"></span>
-                                        </div>
-                                        <div>
-                                            <span>学生票说明说明：</span>
-                                            <span th:text="${dict2.title}"></span>
-                                        </div>
+<!--                                        <div>-->
+<!--                                            <span>电子票说明：</span>-->
+<!--                                            <span th:text="${dict2.describeElectronic}"></span>-->
+<!--                                        </div>-->
+<!--                                        <div>-->
+<!--                                            <span>快递票说明：</span>-->
+<!--                                            <span th:text="${dict2.describesExpress}"></span>-->
+<!--                                        </div>-->
                                         <div>
                                             <span>限购：</span>
                                             <span th:text="${dict2.limitCount}"></span>
@@ -158,19 +160,40 @@
                                             <span>是否学生票：</span>
                                             <span th:text="${dict2.isStudent}"></span>
                                         </div>
+                                        <div>
+                                            <span>是否显示二维码：</span>
+                                            <span th:text="${dict2.isShowCode}"></span>
+                                        </div>
+                                        <div>
+                                            <span>二维码显示时间：</span>
+                                            <span th:if="${dict2.isShowCode==1}" th:text="${dict2.qrCodeShowTime}"></span>
+                                        </div>
                                         <div>
                                             <span>取票方式：</span>
-                                            <span th:text="${dict2.title}"></span>
+                                            <span th:text="${dict2.isElectronic}"></span>
+                                            <span th:text="${dict2.isExpress}"></span>
+                                        </div>
+                                        <div>
+                                            <span>快递票停售时间：</span>
+                                            <span th:text="${dict2.timeEndExpress}"></span>
                                         </div>
                                     </div>
                                 </div>
                             </form>
                         </div>
+                        <div class="panel-body" th:width="max" style="margin-top: 10px">
+                            <div class="radio check-box">
+                                <input type="radio" value="1" name="auditCheck"> 同意</label>
+                            </div>
+                            <div class="radio check-box">
+                                <input type="radio" value="0" name="auditCheck"> 拒绝</label>
+                            </div>
+                            <input name="rejectTxt"  class="form-control" type="text"/>
+                            <button type="button" class="btn btn-w-m btn-success" name="isShowBtn" style="margin-top: 10px"
+                                    onclick="aduitHandler()">审核
+                            </button>
+                        </div>
                     </div>
-
-                    <button type="button" class="btn btn-w-m btn-success" name="isShowBtn"
-                            onclick="">审核
-                    </button>
                 </div>
 
 
@@ -190,15 +213,32 @@
         document.getElementsByName("isShowCheck")[1].checked = true;
     }
 
+    //修改 演出是否显示
     function submitHandler() {
         var param = {
-            "isShow": document.getElementsByName("isShowCheck")[0].checked ? 1 : 0,
+            "isShow": document.getElementsByName("auditCheck")[0].checked ? 1 : 0,
             "performancesId": '[[${kylinPerformanceMisVo.performancesId}]]'.replaceAll("\"", "")
         };
         $.operate.post(prefix + "/isShow", param, function (res) {
         });
     }
 
+    //演出审核
+    function aduitHandler() {
+        const auditStatus = document.getElementsByName("isShowCheck")[0].checked ? 3 : 4;
+        var auditRejectTxt = ""
+        if(4 === auditStatus){
+            auditRejectTxt = document.getElementsByName("rejectTxt")[0].textContent;
+        }
+        var param = {
+            "status": auditStatus,
+            "performancesId": '[[${kylinPerformanceMisVo.performancesId}]]'.replaceAll("\"", ""),
+            "rejectTxt":auditRejectTxt
+        };
+        $.operate.post(prefix + "/audit", param, function (res) {
+        });
+    }
+
     //演出信息
     const type = document.getElementById("type");
     var typeInt = '[[${kylinPerformanceMisVo.type}]]';

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

@@ -536,13 +536,20 @@ public class KylinOrderTicketsServiceImpl extends ServiceImpl<KylinOrderTicketsM
                 httpData.add("expire_time", orderTicketData.getPayCountdownMinute().toString());
 
                 httpData.add("open_id", payAgainParam.getOpenId());
-                httpData.add("show_url", payAgainParam.getOpenId());
-                httpData.add("return_url", payAgainParam.getOpenId());
+
+                if (payAgainParam.getPayType().equals("alipay") && payAgainParam.getDeviceFrom().equals("wap")) {
+                    httpData.add("show_url", payAgainParam.getShowUrl());
+                    httpData.add("return_url", payAgainParam.getReturnUrl());
+                }
 
                 String returnData = HttpUtil.post(payUrl + payAgainParam.getDeviceFrom() + "/" + payAgainParam.getPayType(), httpData);
                 PayResultVo payResultVo = JsonUtils.fromJson(returnData, PayResultVo.class);
                 payResultVo.setOrder_id(orderTicketData.getOrderTicketsId());
                 payResultVo.setPrice(orderTicketData.getPriceActual());
+                if (payAgainParam.getPayType().equals("alipay") && payAgainParam.getDeviceFrom().equals("wap")) {
+                    payResultVo.setShowUrl(payAgainParam.getShowUrl());
+                    payResultVo.setReturnUrl(payAgainParam.getReturnUrl());
+                }
 
                 KylinOrderTickets orderTickets = new KylinOrderTickets();
                 orderTickets.setOrderTicketsId(payAgainParam.getOrderId());