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

liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-web/src/main/java/com/liquidnet/client/admin/web/controller/zhengzai/candy/CandyMgtCouponAdminController.java

@@ -272,7 +272,7 @@ public class CandyMgtCouponAdminController extends BaseController {
                     }
                 }
                 break;
-            case 2:// TODO: 2021/11/9 PM上线前临时加的发放类型（2-积分兑换）
+            case 2:// TODO: 2021/11/9 PM上线前临时加的券领取类型（2-积分兑换）
                 buildParam.setEventType(0);
                 buildParam.setEventLimit(null);
                 break;

liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-web/src/main/resources/templates/zhengzai/adam/order/orderList/detail.html

@@ -218,6 +218,7 @@
     function memberOrderRefund () {
         if ($.validate.form("form-member-order-refund")) {
             $.operate.saveModal(ctx + "adam/order/orderList/refund", $('#form-member-order-refund').serialize(), memberOrderRefundCallback);
+            $('#member-refund-form').hide();
         }
     }
 
@@ -230,8 +231,10 @@
             setTimeout("refreshTab()", 1500);
         } else if (result.code == web_status.WARNING) {
             $.modal.alertWarning(result.msg);
+            $('#member-refund-form').show();
         } else {
             $.modal.alertError(result.msg);
+            $('#member-refund-form').show();
         }
     }
 </script>

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

@@ -273,7 +273,7 @@
         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;
+                searchData = [...res.value];
                 let obj = {};
                 searchData.reduce((cur,next) => {
                     if (!obj[next.performancesId]) {
@@ -294,7 +294,7 @@
         let str = '';
         promiseMethods(phpMallUrl + '/admin/goodListForQuick','get',data,'application/x-www-form-urlencoded').then(res=>{
             if (res.data.length>0) {
-                searchData = res.data;
+                searchData = [...res.data];
                 searchData.forEach((item,index)=>{
                     str+= `<li class="selectData" onclick="selectOne('${item.id}','${item.title}')">${item.title}</li>`
                 })

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

@@ -267,7 +267,7 @@
         let str = '';
         promiseMethods(ctx+'kylin/base/performance/status','get',data,'application/x-www-form-urlencoded').then(res=>{
             if (res.value.length>0) {
-                searchData = res.value;
+                searchData = [...res.value];
                 let obj = {};
                 searchData.reduce((cur,next) => {
                     if (!obj[next.performancesId]) {
@@ -288,7 +288,7 @@
         let str = '';
         promiseMethods(phpMallUrl + '/admin/goodListForQuick','get',data,'application/x-www-form-urlencoded').then(res=>{
             if (res.data.length>0) {
-                searchData = res.data;
+                searchData = [...res.data];
                 searchData.forEach((item,index)=>{
                     str+= `<li class="selectData" onclick="selectOne('${item.id}','id')">${item.title}</li>`
                 })

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

@@ -275,7 +275,7 @@
         let str = '';
         promiseMethods(ctx+'kylin/base/performance/status','get',data,'application/x-www-form-urlencoded').then(res=>{
             if (res.value.length>0) {
-                searchData = res.value;
+                searchData = [...res.value];
                 let obj = {};
                 searchData.reduce((cur,next) => {
                     if (!obj[next.performancesId]) {
@@ -296,7 +296,7 @@
         let str = '';
         promiseMethods(phpMallUrl + '/admin/goodListForQuick','get',data,'application/x-www-form-urlencoded').then(res=>{
             if (res.data.length>0) {
-                searchData = res.data;
+                searchData = [...res.data];
                 searchData.forEach((item,index)=>{
                     str+= `<li class="selectData" onclick="selectOne('${item.id}','${item.title}')">${item.title}</li>`
                 })

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

@@ -218,7 +218,7 @@
         let str = '';
         promiseMethods(ctx+'kylin/base/performance/status','get',data,'application/x-www-form-urlencoded').then(res=>{
             if (res.value.length>0) {
-                searchData = res.value;
+                searchData = [...res.value];
                 let obj = {};
                 searchData.reduce((cur,next) => {
                     if (!obj[next.performancesId]) {

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

@@ -242,7 +242,7 @@
         let str = '';
         promiseMethods(phpMallUrl + '/admin/goodListForQuick','get',data,'application/x-www-form-urlencoded').then(res=>{
             if (res.data.length>0) {
-                searchData = res.data;
+                searchData = [...res.data];
                 searchData.forEach((item,index)=>{
                     str+= `<li class="selectData" onclick="selectOne('${item.id}','id')">${item.title}</li>`
                 })

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

@@ -56,7 +56,7 @@
                 [[${mgtCouponInfoDto?.validity}]] 天
             </div>
         </div>
-        <div class="form-group">
+        <div class="form-group" id="show_detail_redeemValidity">
             <label class="col-sm-3 control-label">兑换有效期：</label>
             <div class="form-control-static col-sm-9">
                 [[${mgtCouponInfoDto?.redeemValidity}]] 天
@@ -90,7 +90,12 @@
 </div>
 <th:block th:include="include :: footer" />
 <script th:inline="javascript">
-
+    const detailVo = /*[[${mgtCouponInfoDto}]]*/{};
+    if (!$.isEmptyObject(detailVo) && detailVo.bindType === 0) {
+        $("#show_detail_redeemValidity").show();
+    } else {
+        $("#show_detail_redeemValidity").hide();
+    }
 </script>
 </body>
 </html>
\ No newline at end of file

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

@@ -56,7 +56,7 @@
                 [[${mgtCouponInfoDto?.validity}]] 天
             </div>
         </div>
-        <div class="form-group">
+        <div class="form-group" id="show_detail_redeemValidity">
             <label class="col-sm-3 control-label">兑换有效期：</label>
             <div class="form-control-static col-sm-9">
                 [[${mgtCouponInfoDto?.redeemValidity}]] 天
@@ -90,7 +90,12 @@
 </div>
 <th:block th:include="include :: footer" />
 <script th:inline="javascript">
-
+    const detailVo = /*[[${mgtCouponInfoDto}]]*/{};
+    if (!$.isEmptyObject(detailVo) && detailVo.bindType === 0) {
+        $("#show_detail_redeemValidity").show();
+    } else {
+        $("#show_detail_redeemValidity").hide();
+    }
 </script>
 </body>
 </html>
\ No newline at end of file

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

@@ -56,7 +56,7 @@
                 [[${mgtCouponInfoDto?.validity}]] 天
             </div>
         </div>
-        <div class="form-group">
+        <div class="form-group" id="show_detail_redeemValidity">
             <label class="col-sm-3 control-label">兑换有效期：</label>
             <div class="form-control-static col-sm-9">
                 [[${mgtCouponInfoDto?.redeemValidity}]] 天
@@ -90,7 +90,12 @@
 </div>
 <th:block th:include="include :: footer" />
 <script th:inline="javascript">
-
+    const detailVo = /*[[${mgtCouponInfoDto}]]*/{};
+    if (!$.isEmptyObject(detailVo) && detailVo.bindType === 0) {
+        $("#show_detail_redeemValidity").show();
+    } else {
+        $("#show_detail_redeemValidity").hide();
+    }
 </script>
 </body>
 </html>
\ No newline at end of file

liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-web/src/main/resources/templates/zhengzai/stone/integralStore.html

@@ -126,10 +126,16 @@
                         // align: 'center',
                         formatter: function (value, row, index) {
                             let dataArr = [];
+                            if (row.status == 7) {
+                                return `<span class="btn btn-warning btn-xs" href="javascript:void(0)" onclick="$.operate.editTab('${row.itemId}')">编辑</span>
+                                <span class="btn btn-warning btn-xs" href="javascript:void(0)" onclick="openShelvesModal('${row.itemId}', 1, '确定下架此商品吗？')">上架</span>
+                                <span class="btn btn-warning btn-xs" href="javascript:void(0)" onclick="openShelvesModal('${row.itemId}', '-1', '确定删除此商品吗？')">删除</span>`
+                            } else {
                                 return `<span class="btn btn-warning btn-xs" href="javascript:void(0)" onclick="$.operate.editTab('${row.itemId}')">编辑</span>
                                 <span class="btn btn-warning btn-xs" href="javascript:void(0)" onclick="openShelvesModal('${row.itemId}', 7, '确定下架此商品吗？')">下架</span>
                                 <span class="btn btn-warning btn-xs" href="javascript:void(0)" onclick="openShelvesModal('${row.itemId}', '-1', '确定删除此商品吗？')">删除</span>`
                             }
+                        }
                     }]
             };
             $.table.init(options);

liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-web/src/main/resources/templates/zhengzai/stone/integralStoreEdit.html

@@ -512,7 +512,7 @@
             delete data.startTime
             delete data.endTime
         }
-        promiseMethods(ctx+'stone/item','post',data).then(res=>{
+        promiseMethods(ctx+'stone/item','put',data).then(res=>{
             layer.msg('' + res);
             if (res.code != undefined && res.code != web_status.SUCCESS) {
                 $.modal.alertWarning(res.msg);

liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-web/src/main/resources/templates/zhengzai/sweet/integralActivity/form.html

@@ -286,10 +286,11 @@
                     let arr = ['谢谢惠顾', '积分', '代金券', '满减券', '优先购买', '实物'];
                     let str = '';
                     arr.forEach((item,i)=> {
+                        i++
                         if (i == data[index].prizeType) {
-                            str += `<option value="${i+1}" selected>${item}</option>`
+                            str += `<option value="${i}" selected>${item}</option>`
                         } else {
-                            str += `<option value="${i+1}">${item}</option>`
+                            str += `<option value="${i}">${item}</option>`
                         }
                     })
                     let dom = `<select id='prizeType${index}' class='form-control' name=''>
@@ -361,7 +362,7 @@
                 title: '奖品剩余',
                 formatter: function(value, row, index) {
                     if (itemId) {
-                        return row.prizeNum - row.WinPrizeNum
+                        return (row.prizeNum - row.WinPrizeNum) || '-'
                     } else {
                         return '-'
                     }

liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-zhengzai/src/main/java/com/liquidnet/client/admin/zhengzai/candy/service/impl/CandyMgtCouponAdminServiceImpl.java

@@ -254,7 +254,7 @@ public class CandyMgtCouponAdminServiceImpl extends ServiceImpl<CandyMgtCouponMa
         initMgtCoupon.setMcouponId(IDGenerator.nextMilliId());
         initMgtCoupon.setCouponId(initCoupon.getCouponId());
 //        initMgtCoupon.setState(0);
-        initMgtCoupon.setState(initCoupon.getBindType() == 2 ? 1 : 0);// TODO: 2021/11/9 PM上线前临时加的发放类型（2-积分兑换），这里根据发放类型设置该记录不执行发放
+        initMgtCoupon.setState(initCoupon.getBindType() == 2 ? 1 : 0);// TODO: 2021/11/9 PM上线前临时加的券领取类型（2-积分兑换），这里根据发放类型设置该记录不执行发放
         initMgtCoupon.setEventAmt(parameter.getEventAmt());
         initMgtCoupon.setEventType(parameter.getEventType());
         initMgtCoupon.setEventLimit(parameter.getEventLimit());

liquidnet-bus-service/liquidnet-service-platform/liquidnet-service-platform-impl/src/main/java/com/liquidnet/service/platform/service/impl/candy/PlatformCandyCouponService.java

@@ -60,6 +60,22 @@ public class PlatformCandyCouponService extends ServiceImpl<CandyCouponMapper, C
                 this.processingCouponCode(mgtCoupon, coupon);
                 break;
             case 1:
+//                switch (mgtCoupon.getEventType()) {// 发放类型[1-会员｜2-手机号|10-全体用户]
+//                    case 1:
+//                        this.processForAllMember(mgtCoupon, coupon, couponRuleDtoList);
+//                        break;
+//                    case 2:
+//                        this.processForUserCoupon(mgtCoupon, coupon, couponRuleDtoList);
+//                        break;
+//                    case 10:
+//                        this.processForCommonCoupon(mgtCoupon, coupon, couponRuleDtoList);
+//                        break;
+//                    default:
+//                        log.warn("发放券任务:无法处理，无效的发放类型[mcouponId:{},eventType:{}]", mgtCoupon.getMcouponId(), mgtCoupon.getEventType());
+//                        break;
+//                }
+//                break;
+            case 2:// TODO: 2021/11/9 PM上线前临时加的券领取类型（2-积分兑换），这里`1-发放至用户｜2-积分兑换`做同逻辑处理
                 switch (mgtCoupon.getEventType()) {// 发放类型[1-会员｜2-手机号|10-全体用户]
                     case 1:
                         this.processForAllMember(mgtCoupon, coupon, couponRuleDtoList);