opt;

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

@@ -18,6 +18,7 @@ import com.liquidnet.client.admin.zhengzai.adam.service.IAdamMemberRightsAdminSe
 import com.liquidnet.client.admin.zhengzai.candy.service.ICandyCouponAdminService;
 import com.liquidnet.client.admin.zhengzai.candy.service.ICandyMgtCouponAdminService;
 import com.liquidnet.common.cache.redis.util.RedisUtil;
+import com.liquidnet.commons.lang.util.CollectionUtil;
 import com.liquidnet.service.adam.constant.AdamRedisConst;
 import com.liquidnet.service.adam.dto.admin.*;
 import com.liquidnet.service.adam.dto.vo.AdamMemberCodeVo;
@@ -335,28 +336,34 @@ public class AdamMemberAdminController extends BaseController {
      */
     private boolean invalidRecoverCode(AdamMemberCodeOptParam optParam, int state) {
         String loginName = ShiroUtils.getLoginName();
-        logger.info("by:{},optParam:{},state:{}", loginName, optParam, state);
         LocalDateTime now = LocalDateTime.now();
+        logger.info("by:{},optParam:{},state:{}", loginName, optParam, state);
+
+        int beforeState = state == 4 ? 0 : (state == 5 ? 1 : -1);
+        ArrayList<String> updateCodeList = CollectionUtil.arrayListString();
         optParam.getCodes().forEach(r -> {
             String key = AdamRedisConst.INFO_MEMBER_CODE.concat(r);
             AdamMemberCodeVo vo = (AdamMemberCodeVo) redisUtil.get(key);
-            if (null != vo) {
-                vo.setState(state);
-                vo.setOperator(loginName);
-                vo.setUpdatedAt(now);
-                redisUtil.set(key, vo);
+            if (null != vo && vo.getState() == beforeState) {
+                redisUtil.del(key);
+
+                updateCodeList.add(vo.getCode());
             }
         });
 
-        LambdaUpdateWrapper<AdamMemberCode> memberCodeUpdateWrapper = Wrappers.lambdaUpdate(AdamMemberCode.class);
-        memberCodeUpdateWrapper.eq(AdamMemberCode::getMemberId, optParam.getMemberId());
-        memberCodeUpdateWrapper.eq(AdamMemberCode::getState, 0);
-        memberCodeUpdateWrapper.in(AdamMemberCode::getCode, optParam.getCodes());
+        if (!CollectionUtils.isEmpty(updateCodeList)) {
+            LambdaUpdateWrapper<AdamMemberCode> memberCodeUpdateWrapper = Wrappers.lambdaUpdate(AdamMemberCode.class);
+            memberCodeUpdateWrapper.eq(AdamMemberCode::getMemberId, optParam.getMemberId());
+            memberCodeUpdateWrapper.eq(AdamMemberCode::getState, beforeState);
+            memberCodeUpdateWrapper.in(AdamMemberCode::getCode, updateCodeList);
+
+            memberCodeUpdateWrapper.set(AdamMemberCode::getState, state);
+            memberCodeUpdateWrapper.set(AdamMemberCode::getOperator, loginName);
+            memberCodeUpdateWrapper.set(AdamMemberCode::getUpdatedAt, now);
 
-        memberCodeUpdateWrapper.set(AdamMemberCode::getState, state);
-        memberCodeUpdateWrapper.set(AdamMemberCode::getOperator, loginName);
-        memberCodeUpdateWrapper.set(AdamMemberCode::getUpdatedAt, now);
-        return adamMemberCodeAdminService.update(memberCodeUpdateWrapper);
+            return adamMemberCodeAdminService.update(memberCodeUpdateWrapper);
+        }
+        return false;
     }
 
     @RequiresPermissions("adam:member:recover:code")

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

@@ -28,15 +28,15 @@
 		</div>
 
 		<div class="btn-group-sm" id="toolbar" role="group">
-			<a class="btn btn-warning" onclick="$.table.exportExcel()" shiro:hasPermission="candy:coupon:code:export">
+			<a class="btn btn-warning" onclick="$.table.exportExcel()" shiro:hasPermission="adam:member:export:code">
 				<i class="fa fa-download"></i> 导出
 			</a>
-			<a class="btn btn-primary multiple disabled" onclick="invalidHandler()" shiro:hasPermission="candy:coupon:code:invalid">
+			<a class="btn btn-primary multiple disabled" onclick="invalidHandler()" shiro:hasPermission="adam:member:invalid:code">
 				<i class="fa fa-edit"></i> 批量失效
 			</a>
-			<a class="btn btn-danger multiple disabled" onclick="recoverHandler()" shiro:hasPermission="candy:coupon:code:recover">
-				<i class="fa fa-remove"></i> 批量退回
-			</a>
+<!--			<a class="btn btn-danger multiple disabled" onclick="recoverHandler()" shiro:hasPermission="adam:member:recover:code">-->
+<!--				<i class="fa fa-remove"></i> 批量退回-->
+<!--			</a>-->
 		</div>
 
 		<div class="col-sm-12 select-table table-striped">
@@ -47,8 +47,8 @@
 <th:block th:include="include :: footer" />
 <th:block th:include="include :: select2-js" />
 <script th:inline="javascript">
-	var invalidFlag = [[${@permission.hasPermi('candy:coupon:code:invalid')}]];
-	var recoverFlag = [[${@permission.hasPermi('candy:coupon:code:recover')}]];
+	var invalidFlag = [[${@permission.hasPermi('adam:member:invalid:code')}]];
+	var recoverFlag = [[${@permission.hasPermi('adam:member:recover:code')}]];
 
 	var datas = [[${@dict.getType('zhengzai_coupon_code_state')}]];// 样例：[{"dictLabel":"未支付","dictValue":"0"},{"dictLabel":"已支付","dictValue":"1"},{"dictLabel":"已关闭","dictValue":"2"}]
 	var memberId = [[${memberId}]];
@@ -61,7 +61,7 @@
 			detailUrl: ctx + "adam/order/orderList/detail/{id}",
 			sortName: "code",
 			sortOrder: "asc",
-			modalName: "数据",
+			modalName: "会员码",
 			columns: [{
 				checkbox: true
 			},
@@ -105,7 +105,8 @@
 						var actions = [];
 						if (row.state === 0) {
 							actions.push('<a class="btn btn-primary btn-xs ' + (invalidFlag && row.state===0) + '" href="javascript:void(0)" onclick="invalidHandler(\'' + row.code + '\')"><i class="fa fa-edit"></i>失效</a> ');
-							actions.push('<a class="btn btn-danger btn-xs ' + (recoverFlag && row.state==0) + '" href="javascript:void(0)" onclick="recoverHandler(\'' + row.code + '\')"><i class="fa fa-remove"></i>退回</a>');
+						} else if (row.state === 1) {
+							// actions.push('<a class="btn btn-danger btn-xs ' + (recoverFlag && row.state==0) + '" href="javascript:void(0)" onclick="recoverHandler(\'' + row.code + '\')"><i class="fa fa-remove"></i>退回</a>');
 						}
 						return actions.join('');
 					}