Merge branch 'dev_20111115' of...

Merge branch 'dev_20111115' of http://gitlab.zhengzai.tv/dongjingwei/liquidnet-bus-v1 into dev_20111115

liquidnet-bus-api/liquidnet-service-candy-api/src/main/java/com/liquidnet/service/candy/dto/admin/CandyMgtCouponBuildParam.java

@@ -47,7 +47,7 @@ public class CandyMgtCouponBuildParam {
     @Min(value = 1, message = "有效期不能小于1")
     @ApiModelProperty(required = true, value = "有效期（单位天）", example = "30")
     private Integer validity;
-    @Min(value = 1, message = "兑换有效期不能小于1")
+//    @Min(value = 1, message = "兑换有效期不能小于1")
     @ApiModelProperty(required = false, value = "兑换有效期（单位天）", example = "30")
     private Integer redeemValidity;
     //private LocalDateTime redeemStart;

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:
+            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/candy/coupon/mgt/add1.html

@@ -162,6 +162,7 @@
         <div class="layui-input-block" style="display: flex">
             <input type="radio" value="0" class="typeTwo" name="typeTwo" checked><span>用户输入兑换</span>
             <input type="radio" value="1" class="typeTwo" name="typeTwo"><span>发送至“我的券”</span>
+            <input type="radio" value="2" class="typeTwo" name="typeTwo"><span>积分兑换</span>
         </div>
 
     </div>
@@ -180,22 +181,22 @@
     </div>
     <div class="changeData">
         <div id="modalOne">
-            <div class="dataOne">
+            <div id="dataOne1" class="dataOne">
                 <span class="labelName"><i class="required">*</i>数量：</span>
-                <input type="text" id="num" required />
+                <input type="text" id="num" value="1" required />
                 <span id="unit">张</span>
             </div>
             <div class="dataOne">
                 <span class="labelName"><i class="required">*</i>券的有效期：</span>
                 <input type="text" id="ticketTime" required />
                 天
-                <p class="prompt">*可兑换的时间</p>
+                <p class="prompt">*兑换后的有效时间</p>
             </div>
             <div class="dataOne" id="exchange">
                 <span class="labelName"><i class="required">*</i>兑换有效期：</span>
                 <input type="text" id="exchangeTime" required />
                 天
-                <p class="prompt">*兑换后的有效时间</p>
+                <p class="prompt">*可兑换的时间</p>
             </div>
         </div>
     </div>
@@ -425,11 +426,23 @@
             $('.sendType').show();
             $('#exchangeTime').val('')
             $('#exchange').hide();
+            $('#dataOne1').show();
             if (sendType == 2) {
                 $('.phoneNumber').show();
             }
+        } else if (typeTwo == 2) {
+            $('#unit').text('张')
+            $('#iptModal').hide();
+            $('.sendType').hide();
+            $('.phoneNumber').hide();
+            $('.test1').val('');
+            $('.phoneNum').val('');
+            $('.test1').hide();
+            $('#exchange').hide();
+            $('#dataOne1').hide();
         } else {
             $('#unit').text('张')
+            $('#dataOne1').show();
             $('#iptModal').hide();
             $('#exchange').show();
             $('.sendType').hide();
@@ -474,7 +487,7 @@
     function create() {
         if (!$('#valFace').val() || !$('#title').val() || !$('#num').val() || !$('#ticketTime').val() || !$('#describeTxt').val()) {
             return layer.msg('请将必填项输入完整～！');
-            if (typeTwo != 1) {
+            if (typeTwo == 0) {
                 if (!$('#exchangeTime').val()) {
                     return layer.msg('请将必填项输入完整～！');
                 }

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

@@ -158,6 +158,7 @@
         <div class="layui-input-block" style="display: flex">
             <input type="radio" value="0" class="typeTwo" name="typeTwo" checked><span>用户输入兑换</span>
             <input type="radio" value="1" class="typeTwo" name="typeTwo"><span>发送至“我的券”</span>
+            <input type="radio" value="2" class="typeTwo" name="typeTwo"><span>积分兑换</span>
         </div>
 
     </div>
@@ -176,9 +177,9 @@
     </div>
     <div class="changeData">
         <div id="modalOne">
-            <div class="dataOne">
+            <div id="dataOne1" class="dataOne">
                 <span class="labelName"><i class="required">*</i>数量：</span>
-                <input type="text" id="num" required />
+                <input type="text" value="1" id="num" required />
                 张
             </div>
             <div class="dataOne">
@@ -359,9 +360,19 @@
             $('.sendType').show();
             $('#exchangeTime').val('')
             $('#exchange').hide();
+            $('#dataOne1').show();
             if (sendType == 2) {
                 $('.phoneNumber').show();
             }
+        } else if (typeTwo == 2) {
+            $('#iptModal').hide();
+            $('#exchange').hide();
+            $('.sendType').hide();
+            $('.phoneNumber').hide();
+            $('.test1').val('');
+            $('.phoneNum').val('');
+            $('.test1').hide();
+            $('#dataOne1').hide();
         } else {
             $('#iptModal').hide();
             $('#exchange').show();
@@ -370,6 +381,7 @@
             $('.test1').val('');
             $('.phoneNum').val('');
             $('.test1').hide();
+            $('#dataOne1').show();
         }
     });
     $("input[name=sendType]").change(function(e){
@@ -407,7 +419,7 @@
     function create() {
         if (!$('#title').val() || !$('#num').val() || !$('#ticketTime').val() || !$('#describeTxt').val()) {
             return layer.msg('请将必填项输入完整～！');
-            if (typeTwo != 1) {
+            if (typeTwo == 0) {
                 if (!$('#exchangeTime').val()) {
                     return layer.msg('请将必填项输入完整～！');
                 }

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

@@ -165,6 +165,7 @@
         <div class="layui-input-block" style="display: flex">
             <input type="radio" value="0" class="typeTwo" name="typeTwo" checked><span>用户输入兑换</span>
             <input type="radio" value="1" class="typeTwo" name="typeTwo"><span>发送至“我的券”</span>
+            <input type="radio" value="2" class="typeTwo" name="typeTwo"><span>积分兑换</span>
         </div>
 
     </div>
@@ -183,9 +184,9 @@
     </div>
     <div class="changeData">
         <div id="modalOne">
-            <div class="dataOne">
+            <div id="dataOne1" class="dataOne">
                 <span class="labelName"><i class="required">*</i>数量：</span>
-                <input type="text" id="num" required />
+                <input type="text" id="num" value="1" required />
                 <span id="unit">张</span>
             </div>
             <div class="dataOne">
@@ -427,9 +428,20 @@
             $('.sendType').show();
             $('#exchangeTime').val('')
             $('#exchange').hide();
+            $('#dataOne1').show();
             if (sendType == 2) {
                 $('.phoneNumber').show();
             }
+        } else if (typeTwo == 2) {
+            $('#unit').text('张')
+            $('#iptModal').hide();
+            $('#exchange').hide();
+            $('.sendType').hide();
+            $('.phoneNumber').hide();
+            $('.test1').val('');
+            $('.phoneNum').val('');
+            $('.test1').hide();
+            $('#dataOne1').hide();
         } else {
             $('#unit').text('张')
             $('#iptModal').hide();
@@ -439,6 +451,7 @@
             $('.test1').val('');
             $('.phoneNum').val('');
             $('.test1').hide();
+            $('#dataOne1').show();
         }
     });
     $("input[name=sendType]").change(function(e){
@@ -476,7 +489,7 @@
     function create() {
         if (!$('#title').val() || !$('#num').val() || !$('#ticketTime').val() || !$('#valOver').val() || !$('#valMinus').val() || !$('#describeTxt').val()) {
             return layer.msg('请将必填项输入完整～！');
-            if (typeTwo != 1) {
+            if (typeTwo == 0) {
                 if (!$('#exchangeTime').val()) {
                     return layer.msg('请将必填项输入完整～！');
                 }

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

@@ -156,6 +156,7 @@
         <div class="layui-input-block" style="display: flex">
             <input type="radio" value="0" class="typeTwo" name="typeTwo" checked><span>用户输入兑换</span>
             <input type="radio" value="1" class="typeTwo" name="typeTwo"><span>发送至“我的券”</span>
+            <input type="radio" value="2" class="typeTwo" name="typeTwo"><span>积分兑换</span>
         </div>
     </div>
     <div class="scope_application" id="scope_application">
@@ -173,9 +174,9 @@
     </div>
     <div class="changeData">
         <div id="modalOne">
-            <div class="dataOne">
+            <div id="dataOne1" class="dataOne">
                 <span class="labelName"><i class="required">*</i>数量：</span>
-                <input type="text" id="num" />
+                <input type="text" value="1" id="num" />
                 张
             </div>
             <div class="dataOne">
@@ -266,15 +267,24 @@
             $('.sendType').show();
             $('#exchangeTime').val('')
             $('#exchange').hide();
+            $('#dataOne1').show();
             if (sendType == 2) {
                 $('.phoneNumber').show();
             }
+        } else if (typeTwo == 2) {
+            $('#unit').text('张')
+            $('#exchange').hide();
+            $('.sendType').hide();
+            $('.phoneNumber').hide();
+            $('.phoneNum').val('');
+            $('#dataOne1').hide();
         } else {
             $('#unit').text('张')
             $('#exchange').show();
             $('.sendType').hide();
             $('.phoneNumber').hide();
             $('.phoneNum').val('');
+            $('#dataOne1').show();
         }
     });
     $("#searchIpt").focus(function(){
@@ -301,7 +311,7 @@
     function create() {
         if (!$('#title').val() || !$('#num').val() || !$('#ticketTime').val() || !$('#discount').val() || !$('#describeTxt').val()) {
             return layer.msg('请将必填项输入完整～！');
-            if (typeTwo != 1) {
+            if (typeTwo == 0) {
                 if (!$('#exchangeTime').val()) {
                     return layer.msg('请将必填项输入完整～！');
                 }

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

@@ -388,7 +388,8 @@
             keyword: searchVal,
             busiType: typeOne,
             pageSize: 20,
-            pageNum: 1
+            pageNum: 1,
+            bindType: 2
         }
         let str = '';
         promiseMethods(prefix + "/list",'post',data,'application/x-www-form-urlencoded').then(res=>{

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

@@ -253,7 +253,8 @@ public class CandyMgtCouponAdminServiceImpl extends ServiceImpl<CandyMgtCouponMa
         CandyMgtCoupon initMgtCoupon = new CandyMgtCoupon();
         initMgtCoupon.setMcouponId(IDGenerator.nextMilliId());
         initMgtCoupon.setCouponId(initCoupon.getCouponId());
-        initMgtCoupon.setState(0);
+//        initMgtCoupon.setState(0);
+        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());
@@ -274,9 +275,7 @@ public class CandyMgtCouponAdminServiceImpl extends ServiceImpl<CandyMgtCouponMa
     @Transactional
     public boolean saveMgtCouponInfo(CandyCoupon initCoupon, CandyMgtCoupon initMgtCoupon, List<CandyCouponRule> initCouponRuleList) {
         int insertCt = candyCouponMapper.insert(initCoupon);
-        if (initCoupon.getBindType() != 2) {// TODO: 2021/11/9 PM上线前临时加的发放类型（2-积分兑换），这里根据发放类型不创建发放任务
-            insertCt += candyMgtCouponMapper.insert(initMgtCoupon);
-        }
+        insertCt += candyMgtCouponMapper.insert(initMgtCoupon);
 
         boolean saveBatch = true;
         if (!CollectionUtils.isEmpty(initCouponRuleList)) {