Merge branch 'hjc_now' into dev_221101ZGB01

liquidnet-bus-api/liquidnet-service-goblin-api/src/main/java/com/liquidnet/service/goblin/dto/vo/GoblinOrderSkuVo.java

@@ -3,6 +3,7 @@ package com.liquidnet.service.goblin.dto.vo;
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.fasterxml.jackson.annotation.JsonFormat;
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import com.liquidnet.commons.lang.util.DateUtil;
 import com.liquidnet.service.goblin.entity.GoblinOrderSku;
 import io.swagger.annotations.ApiModelProperty;
@@ -26,6 +27,7 @@ import static com.liquidnet.commons.lang.util.DateUtil.DTF_YMD_HMS;
  */
 @Data
 @EqualsAndHashCode(callSuper = false)
+@JsonIgnoreProperties(ignoreUnknown = true)
 public class GoblinOrderSkuVo implements Serializable, Cloneable {
 
     @ApiModelProperty(value = "订单sku_id")

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

@@ -16,6 +16,12 @@
             display: none;
         }
 
+        .scope_application {
+            display: flex;
+        }
+        .scope_application .input-group-btn {
+            top: 33px;
+        }
         #test1 {
             display: none;
         }
@@ -88,45 +94,16 @@
             height: 30px;
             width: 200px;
         }
-        .search_ipt ul,.search_ipt li{
+        .search_ipt, .search_ipt2 {
+            width: 200px !important;
+            display: inline-block;
+        }
+        /* .search_ipt ul,.search_ipt li{
             padding: 0;
             margin: 0;
             font-style: normal;
             list-style: none;
-        }
-        .search_ipt ul {
-            display: none;
-            position: absolute;
-            left: 0;
-            top: 26px;
-            padding: 5px 0;
-            z-index: 899;
-            min-width: 200px;
-            border: 1px solid #eee;
-            max-height: 300px;
-            overflow-y: auto;
-            background-color: #fff;
-            border-radius: 2px;
-            box-sizing: border-box;
-            box-shadow: 1px 1px 4px rgb(0 0 0 / 8%);
-        }
-        .search_ipt li {
-            background-color: #fff;
-            cursor: pointer;
-            padding-left: 10px!important;
-            color: #999;
-            padding: 0 10px;
-            line-height: 36px;
-            white-space: nowrap;
-            overflow: hidden;
-            text-overflow: ellipsis;
-        }
-        .search_ipt li:hover {
-            background: #F6F6F6;
-        }
-        .search_ipt .layui-input {
-            width: 200px;
-        }
+        } */
         #test1 {
             display: none;
         }
@@ -168,11 +145,25 @@
     </div>
     <div class="scope_application" id="scope_application">
         <span class="labelName">适用范围：</span>
-        <div class="search_ipt" style="position: relative;display: inline;">
+        <div class="input-group search_ipt" style="margin-right: 12px;">
+            <input id="searchIpt" data-id="" type="text" class="form-control" placeholder="全部">
+            <div class="input-group-btn">
+                <ul class="dropdown-menu dropdown-menu-right" role="menu">
+                </ul>
+            </div>
+        </div>
+        <div class="input-group search_ipt2" style="margin-right: 12px;">
+            <input id="searchIpt2" data-id="" type="text" class="form-control" placeholder="全部商品">
+            <div class="input-group-btn">
+                <ul class="dropdown-menu dropdown-menu-right" role="menu">
+                </ul>
+            </div>
+        </div>
+        <!-- <div class="search_ipt" style="position: relative;display: inline;">
             <input type="text" id="searchIpt" autocomplete="off" class="layui-input" placeholder="全部">
             <ul id="dataList" style="position: absolute;" onclick="selectGoods()"></ul>
-        </div>
-        <select name="bindType" id="selectTwo" placeholder="请选择场次">
+        </div> -->
+        <select name="bindType" id="selectTwo" placeholder="请选择场次" style="margin-right: 12px;">
             <option value="">所有</option>
         </select>
         <select name="bindType" id="selectThree" placeholder="请选择票种">
@@ -264,6 +255,8 @@
     let selectThreeName = ''; // 选中演出三级的名称
     let sendTimeType = '';
     let playMethod = '1'; // 叠加/限制
+    let goodsId = '';
+    $("#scope_application").hide();
     function search() {
         let data = {
             status: '(3,6,8,9)',
@@ -287,6 +280,70 @@
             }
         })
     };
+    function common (num) {
+        console.log(num, '?????')
+        let url = '';
+        let idField = '';
+        let keyField = '';
+        let effectiveFields = '';
+        let domData = '';
+        if (!num) {
+            url = ctx+'compilations/goodsList';
+            idField = 'spuId';
+            keyField = 'name';
+            effectiveFields = ['name'];
+            domData = $("#searchIpt2");
+        } else {
+            url = ctx+'kylin/base/performance/status?status=(3,6,8,9)&title=';
+            idField = 'performancesId';
+            keyField = 'title';
+            effectiveFields = ['title'];
+            domData = $("#searchIpt");
+        }
+        domData.bsSuggest('init', {
+            idField,                 // data.value 的第几个数据，作为input输入框的内容
+            keyField,                // data.value 的第几个数据，作为input输入框的内容
+            allowNoKeyword: false, //是否允许无关键字时请求数据
+            showBtn:false,
+            multiWord: true, //以分隔符号分割的多关键字支持
+            hideOnSelect: true,
+            getDataMethod: "url", //获取数据的方式，总是从 URL 获取
+            effectiveFields,
+            url,
+            /*如果从 url 获取数据，并且需要跨域，则该参数必须设置*/
+            processData: function (json) { // url 获取数据时，对数据的处理，作为 getData 的回调函数
+                console.log(json, '?????')
+                let data = {
+                    value: []
+                };
+                if (num) {
+                    searchData = [...json.value];
+                    let obj = {};
+                    searchData.reduce((cur,next) => {
+                        if (!obj[next.performancesId]) {
+                            obj[next.performancesId] = true
+                            data.value.push(next)
+                        }
+                    },[]) //设置cur默认类型为数组，并且初始值为空的数组
+                    return data
+                } else {
+                    data.value = json.data;
+                    return data;
+                }
+                
+            }
+        }).on('onDataRequestSuccess', function (e, result) {
+        }).on('onSetSelectValue', function (e, selectedData,selectedRawData ) { // 当前行的所有值都能拿到
+            if (num) {
+                selectOne(selectedData.id, selectedData.key)
+            } else {
+                console.log(selectedData, '????')
+                goodsId = selectedData.spuId
+            }
+        }).on('onUnsetSelectValue', function (e) {
+        });;
+        $("#searchIpt").bsSuggest.init
+    }
     function getMallList() {
         let data = {
             name: searchVal
@@ -303,15 +360,9 @@
                 $('#dataList').html('<li style="width:100%;text-align:center;color:#ccc;">--- 暂无数据 ---</li>');
             }
         })
-        // $.ajax({
-        //     type:'get',
-        //     url:phpMallUrl + '/admin/goodListForQuick',
-        //     success:function(e){
-        //     }
-        // });
     };
     function selectOne(id,name) {
-        $("#searchIpt").val(name);
+        console.log(id)
         showId = id;
         if (typeOne == 2) {
             return
@@ -335,31 +386,6 @@
         $('#selectTwo').empty().append(str);
         $('#selectThree').empty();
     };
-    $("#searchIpt").blur(function(){
-        if (typeOne == 2) {
-            getMallList()
-        } else {
-            search()
-        }
-        $('#dataList').show()
-    });
-    // $("#searchIpt").blur(function(){
-    //     setTimeout(() => {
-    //         $('#dataList').hide()
-    //     }, 500);
-    // });
-    function selectGoods(){
-        $('#dataList').hide()
-    }
-    $("#searchIpt").keyup(function(){
-        searchVal = $("#searchIpt").val()
-        // search()
-        if (typeOne == 2) {
-            getMallList()
-        } else {
-            search()
-        }
-    });
     
     $('#selectTwo').change(function(e){
         selectTwoId = $(this).val();
@@ -380,46 +406,39 @@
     $("input[name=typeOne]").change(function(e){
         typeOne = e.target.value;
         if (typeOne == 1) {
+            $('#scope_application').show();
+            $(".search_ipt").show();
+            $(".search_ipt2").hide();
             $("#searchIpt").val('');
-            $("#searchIpt").attr('placeholder', '全部');
-        }
-        if (typeOne != 0) {
-            showId = ''; // 选中演出id
+            $('#selectTwo').show().val('').empty();
+            $('#selectThree').show().val('').empty();
+            common (1)
+        } else if (typeOne == 2) {
+            showId = '';
             selectTwoId = ''; // 选中演出下级的ID
             selectThreeId = ''; // 选中演出三级的ID
             $('#scope_application').show();
+            $(".search_ipt").hide();
+            $(".search_ipt2").show();
+            $("#searchIpt2").val('');
+            $('#selectTwo').hide();
+            $('#selectThree').hide();
+            common (0)
         } else {
-            $('#searchIpt').val('');
-            $('#selectTwo').empty();
-            $('#selectThree').empty('');
             $('#scope_application').hide();
-        }
-        if (typeOne == 2 || typeOne == 3) {
             showId = '';
-            $('#selectTwo').val('');
-            $('#selectThree').val('');
+            selectTwoId = ''; // 选中演出下级的ID
+            selectThreeId = ''; // 选中演出三级的ID
+            $(".search_ipt").hide();
+            $(".search_ipt2").hide();
             $('#selectTwo').hide();
             $('#selectThree').hide();
-            $('#searchIpt').val('');
-            $('#selectTwo').empty();
-            $('#selectThree').empty();
-            $('#dataList').empty();
-            if (typeOne == 2) {
-                $("#searchIpt").val('');
-                $("#searchIpt").attr('placeholder', '全部商品');
-            }
-        } else {
-            $('#selectTwo').show();
-            $('#selectThree').show();
-            $('#selectTwo').empty();
-            $('#selectThree').empty();
-            $('#dataList').empty();
-        }
-        if (typeOne == 3) {
-            $('.playMethod').show()
-        } else {
-            $('.playMethod').hide()
         }
+        // if (typeOne == 3) {
+        //     $('.playMethod').show()
+        // } else {
+        //     $('.playMethod').hide()
+        // }
     });
     $("input[name=typeTwo]").change(function(e){
         typeTwo = e.target.value;
@@ -438,9 +457,8 @@
             $('#iptModal').hide();
             $('.sendType').hide();
             $('.phoneNumber').hide();
-            $('.test1').val('');
+            $('.test1').val('').hide();
             $('.phoneNum').val('');
-            $('.test1').hide();
             $('#exchange').hide();
             $('#dataOne1').hide();
         } else {
@@ -450,9 +468,8 @@
             $('#exchange').show();
             $('.sendType').hide();
             $('.phoneNumber').hide();
-            $('.test1').val('');
+            $('.test1').val('').hide();
             $('.phoneNum').val('');
-            $('.test1').hide();
         }
     });
     $("input[name=sendType]").change(function(e){
@@ -503,9 +520,6 @@
         let useScope = 100;
         let busiName = $('#searchIpt').val();
         let busiId = '';
-        if (!$('#searchIpt').val()) {
-            showId = '';
-        }
         if (showId) {
             useScope = 90;
             busiId = showId;
@@ -521,14 +535,12 @@
             // busiName = selectThreeName;
         }
         if (typeOne == 2) {
-            if (showId) {
             useScope = 80;
             busiId = showId;
-            }
-            busiName = $("#searchIpt").val() || '全部商品';
+            busiName = $("#searchIpt2").val() || '全部商品';
         }
         if (typeOne == 0) {
-            busiName = $("#searchIpt").val() || '全场适用';
+            busiName = '全场适用';
         }
         if (typeOne == 3) {
             if (showId) {

liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-web/src/main/resources/templates/zhengzai/store/placingOrder/activityList.html

@@ -98,9 +98,9 @@
                     <a class="btn btn-success" id="addActivity" th:onclick="$.operate.addTab()">
                         <i class="fa fa-plus"></i> 新增活动
                     </a>
-                    <a class="btn btn-warning" id="button-open-11">
+                    <!-- <a class="btn btn-warning" id="button-open-11">
                         <i class="fa fa-download"></i> 导出Excel
-                    </a>
+                    </a> -->
                 </div>
             </div>
             

liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-web/src/main/resources/templates/zhengzai/store/placingOrder/activityStoreList.html

@@ -73,14 +73,14 @@
 <body class="tagStore">
     <div class="container-div">
         <div class="row">
-            <div class="btn-group-sm" id="toolbar">
+            <!-- <div class="btn-group-sm" id="toolbar">
                 <div>
                     <a class="btn btn-warning" id="button-open-11">
                         <i class="fa fa-download"></i> 导出Excel
                     </a>
                 </div>
-            </div>
-            <div class="col-sm-12 search-collapse">
+            </div> -->
+            <!-- <div class="col-sm-12 search-collapse">
                 <form id="role-form">
                     <div class="select-list">
                         <ul>
@@ -95,7 +95,7 @@
                         </ul>
                     </div>
                 </form>
-            </div>
+            </div> -->
             <div class="col-sm-12 select-table table-striped">
                 <table id="bootstrap-table"></table>
             </div>
@@ -142,7 +142,7 @@
                         data: res.data,
                         // onLoadSuccess: onLoadSuccess,
                         showSearch: false,
-                        showRefresh: true,
+                        showRefresh: false,
                         showColumns: false,
                         showToggle: false,
                         columns: [

liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-web/src/main/resources/templates/zhengzai/store/placingOrder/addNewActivity.html

@@ -232,6 +232,8 @@
             $(this).fileinput("upload");
         })
         .on("fileuploaded", function (event, data) {       //上传回调事件
+            console.log(event, data)
+            if (data.response.code == 1) return layer.msg(data.response.message);
             let showPicture = 'https://img.zhengzai.tv/' + data.response.data.ossPath;
             $("#viewImg").attr('src', showPicture)
         })
@@ -362,7 +364,7 @@
             endTime: $("#endTime").val(),
             startTime: $("#startTime").val(),
             name: $("#selectShow").val(),
-            performanceId: $("#selectShow").attr('data-id'),
+            performanceId: $("#selectShow").attr('data-id').split(',')[$("#selectShow").attr('data-id').split(',').length - 1],
             performanceImg: $("#viewImg").attr('src')
         } // endTime
         if (marketId) {

liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-web/src/main/resources/templates/zhengzai/store/placingOrder/setGoodsRole.html

@@ -128,20 +128,20 @@
                             align: 'center'
                         },
                         {
-                            field: 'buyLimit',
+                            field: 'stockMarketing',
                             // title: '库存限量<a onclick="setPrice(2)">批量</a>',
                             title: '库存限量',
                             width: '150',
                             align: 'center',
-                            formatter: function (value, row, index) {
-                                let str = '';
-                                if (value == 0) {
-                                    str = '无限量';
-                                } else {
-                                    str = value;
-                                }
-                                return str
-                            }
+                            // formatter: function (value, row, index) {
+                            //     let str = '';
+                            //     if (value == 0) {
+                            //         str = '无限量';
+                            //     } else {
+                            //         str = value;
+                            //     }
+                            //     return str
+                            // }
                         },
                         {
                             field: 'buyLimit',
@@ -165,20 +165,20 @@
                                 if (value == 0) {
                                     return `<div style="display:flex;">
                                     <label style="margin-right:12px;">
-                                        <input type="radio" checked value="1" id="optionsRadios1" name="optionsRadios${index}"><span>全部用户</span></label>
+                                        <input disabled type="radio" checked value="1" id="optionsRadios1" name="optionsRadios${index}"><span>全部用户</span></label>
                                     <label style="margin-right:12px;">
-                                        <input type="radio" value="2" id="optionsRadios1" name="optionsRadios${index}"><span>仅支持会员购买</span></label>
+                                        <input disabled type="radio" value="2" id="optionsRadios1" name="optionsRadios${index}"><span>仅支持会员购买</span></label>
                                     <label style="margin-right:12px;">
-                                        <input type="radio" value="3" id="optionsRadios1" name="optionsRadios${index}"><span>指定用户购买</span></label>
+                                        <input disabled type="radio" value="3" id="optionsRadios1" name="optionsRadios${index}"><span>指定用户购买</span></label>
                                     </div>`   
                                 } else {
                                     return `<div style="display:flex;">
                                     <label style="margin-right:12px;">
-                                        <input type="radio" value="1" id="optionsRadios1" name="optionsRadios${index}"><span>全部用户</span></label>
+                                        <input disabled type="radio" value="1" id="optionsRadios1" name="optionsRadios${index}"><span>全部用户</span></label>
                                     <label style="margin-right:12px;">
-                                        <input type="radio" checked value="2" id="optionsRadios1" name="optionsRadios${index}"><span>仅支持会员购买</span></label>
+                                        <input disabled type="radio" checked value="2" id="optionsRadios1" name="optionsRadios${index}"><span>仅支持会员购买</span></label>
                                     <label style="margin-right:12px;">
-                                        <input type="radio" value="3" id="optionsRadios1" name="optionsRadios${index}"><span>指定用户购买</span></label>
+                                        <input disabled type="radio" value="3" id="optionsRadios1" name="optionsRadios${index}"><span>指定用户购买</span></label>
                                     </div>`   
                                 }
                                 

liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-zhengzai/src/main/java/com/liquidnet/client/admin/zhengzai/goblin/service/impl/GoblinZhengzaiMarketServiceImpl.java

@@ -141,6 +141,8 @@ public class GoblinZhengzaiMarketServiceImpl implements IGoblinZhengzaiMarketSer
         BeanUtils.copyProperties(selfMarketing, vo);
         vo.setStartTime(st);
         vo.setEndTime(et);
+        vo.setEndTime(et);
+        vo.setStatus(0);
         vo.setPerformanceId(performanceId);
         vo.setPerformanceImg(img);
         vo.setCreatedAt(DateUtil.Formatter.yyyyMMddHHmmss.format(selfMarketing.getCreatedAt()));

liquidnet-bus-do/liquidnet-service-goblin-do/src/main/resources/com.liquidnet.service.goblin.mapper/GoblinSelfMarketingMapper.xml

@@ -48,7 +48,7 @@ select b.store_id,
        IFNull(count(distinct d.sku_id), 0) as 'sku_count'
 from goblin_self_marketing as a
          inner join goblin_marketing_zhengzai_relation as b on a.self_market_id = b.self_market_id
-         inner join goblin_store_info as c on c.store_id = b.store_id
+         inner join goblin_store_info as c on c.store_id = b.store_id and b.del_tag = 0
          left join goblin_marketing_zhengzai as d on d.store_id = b.store_id  and d.self_market_id = b.self_market_id
 where a.self_market_id = #{marketId} and b.del_tag = 0
 GROUP BY b.store_id ORDER BY b.created_at asc
@@ -73,7 +73,6 @@ GROUP BY b.store_id ORDER BY b.created_at asc
         <where>
             gsm.del_flag = 0
             <if test="purchaseName != null and purchaseName!=''">and gsm.name like concat('%', #{purchaseName}, '%')
-                '%'
             </if>
             <if test="ct != null and ct!=''">and gsm.created_at = #{ct}</if>
             <if test="st != null and et != null and st != '' and et != ''">and and gsm.start_time <![CDATA[ >= ]]> #{st}

liquidnet-bus-service/liquidnet-service-goblin/liquidnet-service-goblin-impl/src/main/java/com/liquidnet/service/goblin/service/impl/GoblinStoreZhengzaiServiceImpl.java

@@ -73,7 +73,7 @@ public class GoblinStoreZhengzaiServiceImpl implements IGoblinStoreZhengzaiServi
             return ResponseDto.failure("店铺不存在");
         }
         GoblinSelfMarketingVo marketingVo = redisUtils.getSelfMarket(marketId);
-        if (marketingVo.getStatus() == 7) {
+        if (marketingVo.getStatus()!=null && marketingVo.getStatus() == 7) {
             return ResponseDto.failure("活动已停用");
         }
         //todo

liquidnet-bus-service/liquidnet-service-order/liquidnet-service-order-impl/src/main/java/com/liquidnet/service/dragon/channel/wepay/resp/AliPayRefundReturnCallBackDto.java

 package com.liquidnet.service.dragon.channel.wepay.resp;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
+import com.liquidnet.service.goblin.dto.vo.GoblinOrderSkuVo;
 import lombok.Data;
 
 @Data
-public class AliPayRefundReturnCallBackDto {
+public class AliPayRefundReturnCallBackDto implements Cloneable{
     @JsonProperty("gmt_create")
     private String gmtCreate;
     @JsonProperty("charset")
@@ -54,4 +55,13 @@ public class AliPayRefundReturnCallBackDto {
     @JsonProperty("seller_id")
     private String sellerId;
 
+    private static final AliPayRefundReturnCallBackDto obj = new AliPayRefundReturnCallBackDto();
+
+    public static AliPayRefundReturnCallBackDto getNew() {
+        try {
+            return (AliPayRefundReturnCallBackDto) obj.clone();
+        } catch (CloneNotSupportedException e) {
+            return new AliPayRefundReturnCallBackDto();
+        }
+    }
 }

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

@@ -608,6 +608,14 @@ public class DragonOrderRefundsServiceImpl implements IDragonOrderRefundsService
             contentDto.setRequest(JSON.toJSONString(response.getParams()));
             contentDto.setResponse(response.getBody());
             channelDto.setContent(contentDto);
+            if(DragonConstant.REFUND_TYPE_MICROPAY_ALIPAY.equals(paymentType) && response.getFundChange().equals("Y")) {
+                AliPayRefundReturnCallBackDto map = AliPayRefundReturnCallBackDto.getNew();
+                map.setOutBizNo(response.getOutTradeNo());
+                map.setTradeNo(response.getTradeNo());
+                map.setOutTradeNo(response.getOutTradeNo());
+                map.setGmtRefund(DateUtil.format(response.getGmtRefundPay(), DateUtil.Formatter.yyyyMMddHHmmss));
+                aliPayRefundCallBack(JSON.toJSONString(map));
+            }
             return channelDto;
         } catch (Exception e) {
             e.printStackTrace();