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

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

@@ -172,7 +172,7 @@
             <ul id="dataList" style="position: absolute;"></ul>
         </div>
         <select name="bindType" id="selectTwo" placeholder="请选择场次">
-            <option value="">所有111</option>
+            <option value="">所有</option>
         </select>
         <select name="bindType" id="selectThree" placeholder="请选择票种">
             <option value="">所有</option>

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

@@ -267,9 +267,16 @@
         promiseMethods(ctx+'kylin/base/performance/status','get',data,'application/x-www-form-urlencoded').then(res=>{
             if (res.value.length>0) {
                 searchData = res.value;
-                searchData.forEach((item,index)=>{
-                    str+= `<li class="selectData" onclick="selectOne('${item.performancesId}','${item.title}')">${item.title}</li>`
-                })
+                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默认类型为数组，并且初始值为空的数组
+                // searchData.forEach((item,index)=>{
+                //     str+= `<li class="selectData" onclick="selectOne('${item.performancesId}','${item.title}')">${item.title}</li>`
+                // })
                 $('#dataList').html(str);
             } else {
                 $('#dataList').html('<li style="width:100%;text-align:center;color:#ccc;">--- 暂无数据 ---</li>');

liquidnet-bus-service/liquidnet-service-platform/liquidnet-service-platform-impl/src/main/java/com/liquidnet/service/platform/service/refund/KylinRefundsStatusServiceImpl.java

@@ -228,6 +228,7 @@ public class KylinRefundsStatusServiceImpl {
         dataUtils.delOrderRefundVo(refundInfo.getOrderRefundsId());
         dataUtils.delOrderRefundVoByOrderId(refundInfo.getOrderTicketsId());
 
+        log.info("refundCallback数据库更新res: [update1={},update2={},update3={}]", update1, update2, update3);
         if (refundInfo.getType() != KylinTableStatusConst.ORDER_REFUND_TYPE_AUTO && update3 > 0) {
             // 退还库存
             for (String entitiesId : orderTicketEntitiesIdsArr) {
@@ -235,7 +236,8 @@ public class KylinRefundsStatusServiceImpl {
                         Wrappers.lambdaQuery(KylinOrderTicketEntities.class).eq(KylinOrderTicketEntities::getOrderTicketEntitiesId, entitiesId)
                 );
                 if (entitiesInfo.getIsPayment() == KylinTableStatusConst.ENTITIES_IS_PAYMENT3) {
-                    dataUtils.changeSurplusGeneral(entitiesInfo.getTicketId(), 1);
+                    int surplusGeneral = dataUtils.changeSurplusGeneral(entitiesInfo.getTicketId(), 1);
+                    log.info("refundCallback回滚库存res: [surplusGeneral={},ticketId={},orderRefundCode={}]", surplusGeneral, entitiesInfo.getTicketId(), refundCallbackParam.getOrderRefundCode());
                     log.info(UserPathDto.setData("changeBuyInfo", "UserId=" + orderInfo.getUserId() + "idCard=" + entitiesInfo.getEnterIdCode() + " PerformanceId=" + orderRelations.getPerformanceId() + " TicketId=" + entitiesInfo.getTicketId(), "info"));
                     dataUtils.changeBuyInfo(orderInfo.getUserId(), entitiesInfo.getEnterIdCode(), orderRelations.getPerformanceId(), entitiesInfo.getTicketId(), -1);
                 }