修改创建成功之后的跳转

liquidnet-bus-api/liquidnet-service-kylin-api/src/main/java/com/liquidnet/service/kylin/dto/vo/returns/KylinOrderRefundsVo.java

@@ -28,6 +28,8 @@ import java.util.List;
 @ApiModel
 public class KylinOrderRefundsVo implements Serializable,Cloneable {
 
+    private static final long serialVersionUID = 268172565273929795L;
+
     @ApiModelProperty(value = "主键ID")
     private String orderRefundsId;
 
@@ -167,10 +169,10 @@ public class KylinOrderRefundsVo implements Serializable,Cloneable {
                     this.statusName = "退款失败";
                     break;
                 case 7:
-                    this.statusName = "二审通过等待退款";
+                    this.statusName = "财务通过等待退款";
                     break;
                 case 8:
-                    this.statusName = "二审驳回退款";
+                    this.statusName = "财务驳回退款";
                     break;
                 default:
                     this.statusName = "其他";

liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-web/src/main/java/com/liquidnet/client/admin/web/controller/zhengzai/adam/AdamMemberAdminController.java

@@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.liquidnet.client.admin.common.annotation.Log;
 import com.liquidnet.client.admin.common.core.controller.BaseController;
 import com.liquidnet.client.admin.common.core.domain.AjaxResult;
+import com.liquidnet.client.admin.common.core.domain.entity.SysUser;
 import com.liquidnet.client.admin.common.core.page.TableDataInfo;
 import com.liquidnet.client.admin.common.enums.BusinessType;
 import com.liquidnet.client.admin.zhengzai.adam.service.IAdamMemberAdminService;
@@ -32,6 +33,7 @@ import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 
 import java.math.BigDecimal;
+import java.util.Arrays;
 import java.util.Collections;
 import java.util.List;
 import java.util.Map;
@@ -137,6 +139,14 @@ public class AdamMemberAdminController extends BaseController {
         return prefix + "/info";
     }
 
+    @RequiresPermissions("adam:member:edit:onsale")
+    @Log(title = "会员管理:会员卡编辑:开售停售", businessType = BusinessType.UPDATE)
+    @PostMapping("edit_onsale")
+    @ResponseBody
+    public AjaxResult editOnsale(AdamMemberBuildParam parameter) {
+        return this.toAjax(adamMemberService.edit(parameter));
+    }
+
     @ApiOperation(value = "会员设置:基础信息编辑")
     @RequiresPermissions("adam:member:edit:basic")
     @Log(title = "会员管理:会员卡编辑:基础信息", businessType = BusinessType.UPDATE)

liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-web/src/main/resources/templates/zhengzai/adam/member/member.html

@@ -15,6 +15,7 @@
 <th:block th:include="include :: footer" />
 <th:block th:include="include :: select2-js" />
 <script th:inline="javascript">
+    var editOnsaleFlag = [[${@permission.hasPermi('adam:member:edit:onsale')}]] == 'hidden';
     var editFlag = [[${@permission.hasPermi('adam:member:view:edit')}]];
     var viewMemberCodeMgtFlag = [[${@permission.hasPermi('adam:member:code:mgt:list')}]];
     var prefix = ctx + "adam/member";
@@ -56,11 +57,18 @@
                     field: 'onsale',
                     title: '开售状态',
                     align: 'center',
-                    formatter: function(value, row, index) {
-                        var actions = [];
-                        var listClass = "badge badge-" + (value === 1 ? 'primary' : 'danger');
-                        actions.push($.common.sprintf("<span class='%s'>%s</span>", listClass, value === 1 ? '开售' : '停售'));
-                        return actions;
+                    // formatter: function(value, row, index) {
+                    //     var actions = [];
+                    //     var listClass = "badge badge-" + (value === 1 ? 'primary' : 'danger');
+                    //     actions.push($.common.sprintf("<span class='%s'>%s</span>", listClass, value === 1 ? '开售' : '停售'));
+                    //     return actions;
+                    // }
+                    formatter: function (value, row, index) {
+                        if (value == 1) {
+                            return '<i class=\"fa fa-toggle-on text-info fa-2x\" onclick="onsaleDisable(\'' + row.memberId + '\')"></i> ';
+                        } else {
+                            return '<i class=\"fa fa-toggle-off text-info fa-2x\" onclick="onsaleEnable(\'' + row.memberId + '\')"></i> ';
+                        }
                     }
                 },
                 {
@@ -82,6 +90,24 @@
         $.modal.openTab("会员码管理", 'adam/mcode/mgt?memberId=' + memberId);
     }
 
+    /* 会员停售 */
+    function onsaleDisable(memberId) {
+        if (!editOnsaleFlag) {
+            $.modal.confirm("确认要停售VIP吗？", function() {
+                $.operate.post(prefix + "/edit_onsale", { "memberId": memberId, "onsale": 2 });
+            });
+        }
+    }
+
+    /* 会员开售 */
+    function onsaleEnable(memberId) {
+        if (!editOnsaleFlag) {
+            $.modal.confirm("确认要开售VIP吗？", function() {
+                $.operate.post(prefix + "/edit_onsale", { "memberId": memberId, "onsale": 1 });
+            });
+        }
+    }
+
     function setVipTabs () {
         window.localStorage.setItem('tabActive', 0);
     }

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

@@ -288,7 +288,7 @@
     };
     function getMallList() {
         let data = {
-            title: ''
+            title: searchVal
         }
         let str = '';
         promiseMethods(phpMallUrl + '/admin/goodListForQuick','get',data,'application/x-www-form-urlencoded').then(res=>{
@@ -352,7 +352,13 @@
     });
     $("#searchIpt").keyup(function(){
         searchVal = $("#searchIpt").val()
-        search()
+        // search()
+        if (typeOne == 2) {
+            getMallList()
+        } else {
+            console.log('search')
+            search()
+        }
     });
     
     $('#selectTwo').change(function(e){
@@ -553,9 +559,14 @@
         }
         console.log(data,'data')
         promiseMethods('/candy/coupon/mgt/add','post',JSON.stringify(data),'application/json').then(res=>{
-            layer.msg('创建成功！');
-            $.operate.successTabCallback(res);
-            closeItem();
+            layer.msg('' + res);
+            if (res.code != undefined && res.code != web_status.SUCCESS) {
+                $.modal.alertWarning(res.msg);
+                return [];
+            } else if (res.code == web_status.SUCCESS) {
+                $.operate.successTabCallback(res);
+                closeItem();
+            }
         })
     }
     function promiseMethods(url,type,data,contentType) {

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

@@ -461,10 +461,14 @@
         }
         console.log(data,'data')
         promiseMethods('/candy/coupon/mgt/add','post',JSON.stringify(data),'application/json').then(res=>{
-            console.log(res)
-            layer.msg('创建成功！');
-            $.operate.successTabCallback(res);
-            closeItem();
+            layer.msg('' + res);
+            if (res.code != undefined && res.code != web_status.SUCCESS) {
+                $.modal.alertWarning(res.msg);
+                return [];
+            } else if (res.code == web_status.SUCCESS) {
+                $.operate.successTabCallback(res);
+                closeItem();
+            }
         })
     }
     function promiseMethods(url,type,data,contentType) {

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

@@ -290,7 +290,7 @@
     };
     function getMallList() {
         let data = {
-            title: ''
+            title: searchVal
         }
         let str = '';
         promiseMethods(phpMallUrl + '/admin/goodListForQuick','get',data,'application/x-www-form-urlencoded').then(res=>{
@@ -353,7 +353,13 @@
     });
     $("#searchIpt").keyup(function(){
         searchVal = $("#searchIpt").val()
-        search()
+        // search()
+        if (typeOne == 2) {
+            getMallList()
+        } else {
+            console.log('search')
+            search()
+        }
     });
     
     $('#selectTwo').change(function(e){
@@ -554,9 +560,14 @@
             delete data.eventLimit;
         }
         promiseMethods('/candy/coupon/mgt/add','post',JSON.stringify(data),'application/json').then(res=>{
-            layer.msg('创建成功！');
-            $.operate.successTabCallback(res);
-            closeItem();
+            layer.msg('' + res);
+            if (res.code != undefined && res.code != web_status.SUCCESS) {
+                $.modal.alertWarning(res.msg);
+                return [];
+            } else if (res.code == web_status.SUCCESS) {
+                $.operate.successTabCallback(res);
+                closeItem();
+            }
         })
     }
     function promiseMethods(url,type,data,contentType) {

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

@@ -333,16 +333,14 @@
             "redeemValidity": Number($('#ticketTime').val()) // 兑换有效期
         }
         promiseMethods('/candy/coupon/mgt/add','post',JSON.stringify(data),'application/json').then(res=>{
-            layer.msg('创建成功！');
-            let data = {
-                pageSize: 10,
-                pageNum: 1,
-                orderByColumn: 'createdAt',
-                isAsc: 'desc',
-                couType: 3
+            layer.msg('' + res);
+            if (res.code != undefined && res.code != web_status.SUCCESS) {
+                $.modal.alertWarning(res.msg);
+                return [];
+            } else if (res.code == web_status.SUCCESS) {
+                $.operate.successTabCallback(res);
+                closeItem();
             }
-            $.operate.successTabCallback(res);
-            closeItem();
         })
     }
     function promiseMethods(url,type,data,contentType) {

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

@@ -352,9 +352,14 @@
             delete data.eventLimit;
         }
         promiseMethods('/candy/coupon/mgt/add','post',JSON.stringify(data),'application/json').then(res=>{
-            layer.msg('创建成功！');
-            $.operate.successTabCallback(res);
-            closeItem();
+            layer.msg('' + res);
+            if (res.code != undefined && res.code != web_status.SUCCESS) {
+                $.modal.alertWarning(res.msg);
+                return [];
+            } else if (res.code == web_status.SUCCESS) {
+                $.operate.successTabCallback(res);
+                closeItem();
+            }
         })
     }
     function promiseMethods(url,type,data,contentType) {

liquidnet-bus-do/liquidnet-service-kylin-do/src/main/java/com/liquidnet/service/kylin/dao/OrderRefundDao.java

@@ -103,10 +103,10 @@ public class OrderRefundDao implements Serializable {
                 this.statusName="退款失败";
                 break;
             case 7:
-                this.statusName="二审通过等待退款";
+                this.statusName="财务通过等待退款";
                 break;
             case 8:
-                this.statusName="二审驳回退款";
+                this.statusName="财务驳回退款";
                 break;
             case 9:
                 this.statusName="已确认收货";

liquidnet-bus-do/liquidnet-service-kylin-do/src/main/java/com/liquidnet/service/kylin/entity/KylinOrderRefunds.java

@@ -18,9 +18,9 @@ import lombok.EqualsAndHashCode;
  */
 @Data
 @EqualsAndHashCode(callSuper = false)
-public class KylinOrderRefunds implements Serializable {
+public class KylinOrderRefunds implements Serializable, Cloneable{
 
-    private static final long serialVersionUID = 1L;
+    private static final long serialVersionUID = 5901424962410128552L;
 
     @TableId(value = "mid", type = IdType.AUTO)
     private Integer mid;

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

 package com.liquidnet.service.platform.service.refund;
 
-import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.liquidnet.commons.lang.util.HttpUtil;
@@ -8,6 +7,7 @@ import com.liquidnet.service.kylin.constant.KylinTableStatusConst;
 import com.liquidnet.service.kylin.dto.param.RefundCallbackParam;
 import com.liquidnet.service.kylin.dto.vo.returns.KylinOrderRefundsVo;
 import com.liquidnet.service.kylin.entity.KylinOrderRefunds;
+import com.liquidnet.service.kylin.entity.KylinOrderTicketStatus;
 import com.liquidnet.service.kylin.entity.KylinOrderTickets;
 import com.liquidnet.service.kylin.mapper.*;
 import com.liquidnet.service.kylin.service.IKylinOrderRefundsService;
@@ -52,6 +52,8 @@ public class OrderRefundsCallbackServiceImpl extends ServiceImpl<KylinOrderRefun
     private KylinOrderRefundsMapper kylinOrderRefundsMapper;
     @Autowired
     private KylinOrderTicketsMapper kylinOrderTicketsMapper;
+    @Autowired
+    private KylinOrderTicketStatusMapper kylinOrderTicketStatusMapper;
 
     @Autowired
     MongoTemplate mongoTemplate;
@@ -61,24 +63,32 @@ public class OrderRefundsCallbackServiceImpl extends ServiceImpl<KylinOrderRefun
     private DataUtils dataUtils;
 
     public String refundCallback(RefundCallbackParam refundCallbackParam) {
-        log.info("订单退款回调参数：[RefundCallbackParam={}]", refundCallbackParam);
+        log.info("refundCallback订单退款回调参数: [RefundCallbackParam={}]", refundCallbackParam);
         KylinOrderRefunds refundInfo = kylinOrderRefundsMapper.selectOne(
-                new UpdateWrapper<KylinOrderRefunds>()
-                        .eq("order_refund_code", refundCallbackParam.getOrderRefundCode())
+                Wrappers.lambdaQuery(KylinOrderRefunds.class).eq(KylinOrderRefunds::getOrderRefundCode, refundCallbackParam.getOrderRefundCode())
         );
+
         if (refundInfo == null) {
-            log.info("Failed:{}.RefundController refundCallback: 退款订单查询失败，编号{}", "KylinOrderRefundsServiceImplRefundCallback", refundCallbackParam.getOrderRefundCode());
+            log.info("refundCallback: 退款订单查询失败，编号{}", refundCallbackParam.getOrderRefundCode());
             return "fail";
         }
         if (refundInfo.getStatus() == KylinTableStatusConst.ORDER_REFUND_STATUS_CANCEL || refundInfo.getStatus() == KylinTableStatusConst.ORDER_REFUND_STATUS_REJECT) {
-            log.info("Failed:{}.RefundController refundCallback: 退款订单已取消或已运营审核拒绝，编号{}", "KylinOrderRefundsServiceImplRefundCallback", refundCallbackParam.getOrderRefundCode());
+            log.info("refundCallback: 退款订单已取消，编号{}", refundCallbackParam.getOrderRefundCode());
             return "fail";
         }
         if (refundInfo.getStatus() == KylinTableStatusConst.ORDER_REFUND_STATUS_REFUNDED) {
-            log.info("Failed:{}.RefundController refundCallback: 退款订单已退款，编号{}", "KylinOrderRefundsServiceImplRefundCallback", refundCallbackParam.getOrderRefundCode());
+            log.info("refundCallback: 退款订单已完成，编号{}", refundCallbackParam.getOrderRefundCode());
             return "success";
         }
 
+        /*KylinOrderTicketStatus kylinOrderTicketStatus = kylinOrderTicketStatusMapper.selectOne(
+                Wrappers.lambdaQuery(KylinOrderTicketStatus.class).eq(KylinOrderTicketStatus::getOrderId, refundInfo.getOrderTicketsId())
+        );
+        if (kylinOrderTicketStatus.getStatus() == KylinTableStatusConst.ORDER_STATUS4) {
+            log.info("refundCallback: 票订单已完成退款，编号{}", refundInfo.getOrderTicketsId());
+            return "success";
+        }*/
+
         Integer status = refundCallbackParam.getStatus();
         if (1 == status) { // 退款成功
             boolean res = kylinRefundsStatusServiceImpl.orderTicketRefunded(refundCallbackParam, refundInfo);
@@ -97,7 +107,7 @@ public class OrderRefundsCallbackServiceImpl extends ServiceImpl<KylinOrderRefun
             kylinOrderRefunds.setUpdatedAt(LocalDateTime.now());
             kylinOrderRefundsMapper.update(
                     kylinOrderRefunds,
-                    new UpdateWrapper<KylinOrderRefunds>().eq("order_refunds_id", refundInfo.getOrderRefundsId())
+                    Wrappers.lambdaUpdate(KylinOrderRefunds.class).eq(KylinOrderRefunds::getOrderRefundsId, refundInfo.getOrderRefundsId())
             );
             // 修改缓存
             KylinOrderRefundsVo kylinOrderRefundsVo = new KylinOrderRefundsVo();