后台页面调整;

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

 package com.liquidnet.client.admin.web.controller.zhengzai.candy;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.liquidnet.client.admin.common.annotation.Log;
 import com.liquidnet.client.admin.common.core.controller.BaseController;
@@ -8,6 +9,7 @@ import com.liquidnet.client.admin.common.core.domain.AjaxResult;
 import com.liquidnet.client.admin.common.core.page.TableDataInfo;
 import com.liquidnet.client.admin.common.enums.BusinessType;
 import com.liquidnet.client.admin.common.utils.ShiroUtils;
+import com.liquidnet.client.admin.zhengzai.candy.service.ICandyCouponAdminService;
 import com.liquidnet.client.admin.zhengzai.candy.service.ICandyCouponRuleAdminService;
 import com.liquidnet.client.admin.zhengzai.candy.service.ICandyMgtCouponAdminService;
 import com.liquidnet.client.admin.zhengzai.kylin.service.impl.KylinPerformancesAdminServiceImpl;
@@ -15,13 +17,16 @@ import com.liquidnet.service.candy.dto.admin.CandyCouponRuleBuildParam;
 import com.liquidnet.service.candy.dto.admin.CandyMgtCouponBuildParam;
 import com.liquidnet.service.candy.dto.admin.CandyMgtCouponInfoDto;
 import com.liquidnet.service.candy.dto.admin.CandyMgtCouponListParam;
+import com.liquidnet.service.candy.entity.CandyCoupon;
 import com.liquidnet.service.candy.entity.CandyCouponRule;
+import com.liquidnet.service.candy.entity.CandyMgtCoupon;
 import com.liquidnet.service.kylin.dao.PerformanceSimpleAllDao;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.shiro.authz.annotation.RequiresPermissions;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Controller;
 import org.springframework.ui.ModelMap;
 import org.springframework.util.CollectionUtils;
@@ -29,6 +34,7 @@ import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 
 import java.math.BigDecimal;
+import java.time.LocalDateTime;
 import java.util.Arrays;
 import java.util.List;
 
@@ -37,9 +43,15 @@ import java.util.List;
 @RequestMapping("candy/coupon/mgt")
 public class CandyMgtCouponAdminController extends BaseController {
     private final String prefix = "zhengzai/candy/coupon/mgt";
+
+    @Value("${liquidnet.client.admin.phpMallUrl}")
+    private String phpMallUrl;
+
     @Autowired
     private ICandyMgtCouponAdminService candyMgtCouponAdminService;
     @Autowired
+    private ICandyCouponAdminService candyCouponAdminService;
+    @Autowired
     private ICandyCouponRuleAdminService candyCouponRuleAdminService;
     @Autowired
     private KylinPerformancesAdminServiceImpl kylinPerformancesService;
@@ -135,8 +147,56 @@ public class CandyMgtCouponAdminController extends BaseController {
         return prefix + "/detail" + couType;
     }
 
+    @RequiresPermissions("candy:coupon:mgt:cancel")
+    @GetMapping("cancel/{mcouponId}")
+    @ResponseBody
+    public AjaxResult cancel(@PathVariable("mcouponId") String mcouponId) {
+        LambdaQueryWrapper<CandyMgtCoupon> mgtCouponLambdaQueryWrapper = Wrappers.lambdaQuery(CandyMgtCoupon.class);
+        mgtCouponLambdaQueryWrapper.eq(CandyMgtCoupon::getMcouponId, mcouponId);
+        CandyMgtCoupon mgtCoupon = candyMgtCouponAdminService.getOne(mgtCouponLambdaQueryWrapper);
+        if (null == mgtCoupon) {
+            return AjaxResult.warn(String.format("券记录不存在【%s】", mcouponId));
+        }
+        if (mgtCoupon.getState() == 1) {
+            return AjaxResult.warn("券记录已完成发放");
+        }
+        if (mgtCoupon.getState() == 9) {
+            return AjaxResult.warn("券记录已开始发放");
+        }
+        if (mgtCoupon.getState() != 0) {
+            return AjaxResult.warn("券记录不可取消");
+        }
+        LocalDateTime now = LocalDateTime.now();
+        String loginName = ShiroUtils.getLoginName();
+
+        LambdaUpdateWrapper<CandyMgtCoupon> mgtCouponLambdaUpdateWrapper = Wrappers.lambdaUpdate(CandyMgtCoupon.class);
+        mgtCouponLambdaUpdateWrapper.eq(CandyMgtCoupon::getMcouponId, mcouponId);
+        mgtCouponLambdaUpdateWrapper.eq(CandyMgtCoupon::getState, 0);
+        mgtCouponLambdaUpdateWrapper.set(CandyMgtCoupon::getState, 3);
+        mgtCouponLambdaUpdateWrapper.set(CandyMgtCoupon::getUpdatedAt, now);
+        mgtCouponLambdaUpdateWrapper.set(CandyMgtCoupon::getOperator, loginName);
+        boolean updateMgtCouponFlg = candyMgtCouponAdminService.update(mgtCouponLambdaUpdateWrapper);
+        if (!updateMgtCouponFlg) {
+            return AjaxResult.warn("券记录取消失败，已发放或正在发放中");
+        }
+
+        LambdaUpdateWrapper<CandyCoupon> couponLambdaUpdateWrapper = Wrappers.lambdaUpdate(CandyCoupon.class);
+        couponLambdaUpdateWrapper.eq(CandyCoupon::getCouponId, mgtCoupon.getCouponId());
+        couponLambdaUpdateWrapper.set(CandyCoupon::getState, 2);
+        couponLambdaUpdateWrapper.set(CandyCoupon::getUpdatedAt, now);
+        couponLambdaUpdateWrapper.set(CandyCoupon::getOperator, loginName);
+        candyCouponAdminService.update(couponLambdaUpdateWrapper);
+
+        LambdaUpdateWrapper<CandyCouponRule> couponRuleLambdaUpdateWrapper = Wrappers.lambdaUpdate(CandyCouponRule.class);
+        couponRuleLambdaUpdateWrapper.eq(CandyCouponRule::getCouponId, mgtCoupon.getCouponId());
+        couponRuleLambdaUpdateWrapper.set(CandyCouponRule::getState, 2);
+        candyCouponRuleAdminService.update(couponRuleLambdaUpdateWrapper);
+        return toAjax(updateMgtCouponFlg);
+    }
+
     @GetMapping("add/{couType}")
-    public String add(@PathVariable("couType") String couType) {
+    public String add(@PathVariable("couType") String couType, ModelMap mmap) {
+        mmap.put("phpMallUrl", phpMallUrl);
         return prefix + "/add" + couType;
     }
 

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

@@ -247,7 +247,8 @@
 <th:block th:include="include :: select2-js" />
 <th:block th:include="include :: bootstrap-suggest-js"/>
 </body>
-<script>
+<script th:inline="javascript">
+    var phpMallUrl = [[${phpMallUrl}]];
     var roadShowId = '[[${roadShowId}]]'.replaceAll("\"", "");
     let prefix = ctx;
     let typeOne = '0'; // 类别
@@ -285,7 +286,7 @@
             title: ''
         }
         let str = '';
-        promiseMethods('http://testmall.zhengzai.tv/admin/goodListForQuick','get',data,'application/x-www-form-urlencoded').then(res=>{
+        promiseMethods(phpMallUrl + '/admin/goodListForQuick','get',data,'application/x-www-form-urlencoded').then(res=>{
             if (res.data.length>0) {
                 searchData = res.data;
                 searchData.forEach((item,index)=>{
@@ -298,7 +299,7 @@
         })
         // $.ajax({
         //     type:'get',
-        //     url:'http://testmall.zhengzai.tv/admin/goodListForQuick',
+        //     url:phpMallUrl + '/admin/goodListForQuick',
         //     success:function(e){
         //         console.log(e)
         //     }

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

@@ -250,7 +250,8 @@
 <th:block th:include="include :: select2-js" />
 <th:block th:include="include :: bootstrap-suggest-js"/>
 </body>
-<script>
+<script th:inline="javascript">
+    var phpMallUrl = [[${phpMallUrl}]];
     var roadShowId = '[[${roadShowId}]]'.replaceAll("\"", "");
     let prefix = ctx;
     let typeOne = '0'; // 类别
@@ -288,7 +289,7 @@
             title: ''
         }
         let str = '';
-        promiseMethods('http://testmall.zhengzai.tv/admin/goodListForQuick','get',data,'application/x-www-form-urlencoded').then(res=>{
+        promiseMethods(phpMallUrl + '/admin/goodListForQuick','get',data,'application/x-www-form-urlencoded').then(res=>{
             if (res.data.length>0) {
                 searchData = res.data;
                 searchData.forEach((item,index)=>{
@@ -301,7 +302,7 @@
         })
         // $.ajax({
         //     type:'get',
-        //     url:'http://testmall.zhengzai.tv/admin/goodListForQuick',
+        //     url:phpMallUrl + '/admin/goodListForQuick',
         //     success:function(e){
         //         console.log(e)
         //     }

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

@@ -199,7 +199,8 @@
 <th:block th:include="include :: select2-js" />
 <th:block th:include="include :: bootstrap-suggest-js"/>
 </body>
-<script>
+<script th:inline="javascript">
+    var phpMallUrl = [[${phpMallUrl}]];
     var roadShowId = '[[${roadShowId}]]'.replaceAll("\"", "");
     let prefix = ctx;
     let searchVal = ''; // 输入框内数据

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

@@ -223,7 +223,8 @@
 <th:block th:include="include :: select2-js" />
 <th:block th:include="include :: bootstrap-suggest-js"/>
 </body>
-<script>
+<script th:inline="javascript">
+    var phpMallUrl = [[${phpMallUrl}]];
     var roadShowId = '[[${roadShowId}]]'.replaceAll("\"", "");
     let prefix = ctx;
     let typeOne = '2'; // 类别
@@ -238,7 +239,7 @@
             title: ''
         }
         let str = '';
-        promiseMethods('http://testmall.zhengzai.tv/admin/goodListForQuick','get',data,'application/x-www-form-urlencoded').then(res=>{
+        promiseMethods(phpMallUrl + 'admin/goodListForQuick','get',data,'application/x-www-form-urlencoded').then(res=>{
             if (res.data.length>0) {
                 searchData = res.data;
                 searchData.forEach((item,index)=>{