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

liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-web/src/main/resources/templates/zhengzai/candy/coupon/mgt/add1.html

@@ -257,38 +257,14 @@
     let playMethod = '1'; // 叠加/限制
     let goodsId = '';
     $("#scope_application").hide();
-    function search() {
-        let data = {
-            status: '(3,6,8,9)',
-            title: searchVal
-        }
-        let str = '';
-        promiseMethods(ctx+'kylin/base/performance/status','get',data,'application/x-www-form-urlencoded').then(res=>{
-            if (res.value.length>0) {
-                let filterData = [];
-                searchData = [...res.value];
-                let obj = {};
-                searchData.reduce((cur,next) => {
-                    if (!obj[next.performancesId]) {
-                        obj[next.performancesId] = true
-                        str+= `<li class="selectData" onclick="selectOne('${next.performancesId}','${next.title}')">${next.title}</li>`
-                    }
-                },[]) //设置cur默认类型为数组，并且初始值为空的数组
-                $('#dataList').html(str);
-            } else {
-                $('#dataList').html('<li style="width:100%;text-align:center;color:#ccc;">--- 暂无数据 ---</li>');
-            }
-        })
-    };
     function common (num) {
-        console.log(num, '?????')
         let url = '';
         let idField = '';
         let keyField = '';
         let effectiveFields = '';
         let domData = '';
         if (!num) {
-            url = ctx+'compilations/goodsList';
+            url = ctx+'compilations/goodsList?name=';
             idField = 'spuId';
             keyField = 'name';
             effectiveFields = ['name'];
@@ -338,29 +314,12 @@
                 selectOne(selectedData.id, selectedData.key)
             } else {
                 console.log(selectedData, '????')
-                goodsId = selectedData.spuId
+                goodsId = selectedData.id
             }
         }).on('onUnsetSelectValue', function (e) {
         });;
         $("#searchIpt").bsSuggest.init
     }
-    function getMallList() {
-        let data = {
-            name: searchVal
-        }
-        let str = '';
-        promiseMethods('/compilations/goodsList','get',data).then(res=>{
-            if (res.data.length>0) {
-                searchData = [...res.data];
-                searchData.forEach((item,index)=>{
-                    str+= `<li class="selectData" onclick="selectOne('${item.spuId}','${item.name}')">${item.name}</li>`
-                })
-                $('#dataList').html(str);
-            } else {
-                $('#dataList').html('<li style="width:100%;text-align:center;color:#ccc;">--- 暂无数据 ---</li>');
-            }
-        })
-    };
     function selectOne(id,name) {
         console.log(id)
         showId = id;
@@ -505,7 +464,6 @@
     });
     
     function create() {
-        
         if (!$('#valFace').val() || !$('#title').val() || !$('#num').val() || !$('#ticketTime').val() || !$('#describeTxt').val()) {
             return layer.msg('请将必填项输入完整～！');
             if (typeTwo == 0) {
@@ -536,7 +494,7 @@
         }
         if (typeOne == 2) {
             useScope = 80;
-            busiId = showId;
+            busiId = goodsId;
             busiName = $("#searchIpt2").val() || '全部商品';
         }
         if (typeOne == 0) {

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

@@ -295,9 +295,13 @@ public class KylinPerformancesAdminServiceImpl extends ServiceImpl<KylinPerforma
     @Override
     public List<PerformanceSimpleAllDao> getListDetailByStatus(String status, String title) {
         List<PerformanceTitleDao> dto1List = performancesMapper.misTitleByStatusList(status, title);
-        List<String> performanceIdList = dto1List.stream().map(PerformanceTitleDao::getPerformancesId).collect(Collectors.toList());
-        List<PerformanceSimpleAllDao> dto2List = performancesMapper.misPerformanceDetail(performanceIdList);
-        return dto2List;
+        if (dto1List.size() == 0) {
+            return new ArrayList();
+        } else {
+            List<String> performanceIdList = dto1List.stream().map(PerformanceTitleDao::getPerformancesId).collect(Collectors.toList());
+            List<PerformanceSimpleAllDao> dto2List = performancesMapper.misPerformanceDetail(performanceIdList);
+            return dto2List;
+        }
     }
 
     @Override
@@ -604,19 +608,19 @@ public class KylinPerformancesAdminServiceImpl extends ServiceImpl<KylinPerforma
             smileAgent.setPerformanceId(performancesId);
             smileAgent.setTicketId(ticketId);
             LambdaQueryWrapper<SmileAgent> queryWrapper = Wrappers.lambdaQuery(SmileAgent.class);
-            queryWrapper.eq(SmileAgent::getPerformanceId,performancesId);
-            queryWrapper.eq(SmileAgent::getTicketId,ticketId);
-            if (status.equals(1)){
-                queryWrapper.eq(SmileAgent::getDelTag,0);
+            queryWrapper.eq(SmileAgent::getPerformanceId, performancesId);
+            queryWrapper.eq(SmileAgent::getTicketId, ticketId);
+            if (status.equals(1)) {
+                queryWrapper.eq(SmileAgent::getDelTag, 0);
                 SmileAgent agent = smileAgentMapper.selectOne(queryWrapper);
-                if (agent==null){
+                if (agent == null) {
                     smileAgentMapper.insert(smileAgent);
                 }
-            }else {
+            } else {
                 smileAgent.setDelTag(1);
-                smileAgentMapper.update(smileAgent,queryWrapper);
+                smileAgentMapper.update(smileAgent, queryWrapper);
                 //删除票提redis
-                smileRedisUtils.delAgent(performancesId,ticketId);
+                smileRedisUtils.delAgent(performancesId, ticketId);
                 //查询是否还有设置过开启的票种
                 agentCarryGtZeroByPerId(performancesId);
             }
@@ -629,12 +633,12 @@ public class KylinPerformancesAdminServiceImpl extends ServiceImpl<KylinPerforma
     //校验该演出是否有其他票提设置  用于删除redis中演出id List
     private void agentCarryGtZeroByPerId(String performancesId) {
         List<SmileAgent> agents = smileAgentMapper.selectAgentCarryGtZeroByPerId(performancesId);
-        if (agents.size()>0){
+        if (agents.size() > 0) {
             //是否设置过票提
             boolean tag = true;
             for (SmileAgent agent : agents) {
                 SmileAgentVo agent1 = smileRedisUtils.getAgent(agent.getPerformanceId(), agent.getTicketId());
-                if (agent1!=null){
+                if (agent1 != null) {
                     tag = false;
                     break;
                 }
@@ -646,7 +650,7 @@ public class KylinPerformancesAdminServiceImpl extends ServiceImpl<KylinPerforma
                 showIds.remove(performancesId);
                 smileRedisUtils.setShowIds(showIds);
             }
-        }else {
+        } else {
             //删除演出ids
             List<String> showIds = smileRedisUtils.getShowIds();
             showIds.remove(performancesId);

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

@@ -507,7 +507,7 @@ public class GoblinOrderServiceImpl implements IGoblinOrderService {
             preParam.setPayType("POS_CRASH");
             payCode = "POS_CRASH_PAY_CODE";
             payInnerResultVo = GoblinPayInnerResultVo.getNew();
-            payInnerResultVo.setPrice(BigDecimal.valueOf(0));
+            payInnerResultVo.setPrice(preParam.getPriceActual());
             payInnerResultVo.setPayType(preParam.getPayType());
         }else {
             isFree = true;