Merge remote-tracking branch 'origin/fix_admin_ccode_recover' into pre

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

@@ -112,6 +112,7 @@ public class CandyCouponCodeAdminController extends BaseController {
         LambdaQueryWrapper<CandyCouponCode> couponCodeLambdaQueryWrapper = Wrappers.lambdaQuery(CandyCouponCode.class);
         couponCodeLambdaQueryWrapper.in(CandyCouponCode::getCcode, ccodes);
         couponCodeLambdaQueryWrapper.eq(CandyCouponCode::getCouponId, couponId);
+        couponCodeLambdaQueryWrapper.eq(CandyCouponCode::getState, 0);
         List<CandyCouponCode> list = candyCouponCodeAdminService.list(couponCodeLambdaQueryWrapper);
 
         List<String> ccodeUpdateList = CollectionUtil.arrayListString();
@@ -155,6 +156,8 @@ public class CandyCouponCodeAdminController extends BaseController {
         LambdaQueryWrapper<CandyCouponCode> couponCodeLambdaQueryWrapper = Wrappers.lambdaQuery(CandyCouponCode.class);
         couponCodeLambdaQueryWrapper.in(CandyCouponCode::getUcouponId, ucouponIds);
         couponCodeLambdaQueryWrapper.eq(CandyCouponCode::getCouponId, couponId);
+        couponCodeLambdaQueryWrapper.eq(CandyCouponCode::getState, 1);
+        couponCodeLambdaQueryWrapper.select(CandyCouponCode::getCouponId, CandyCouponCode::getUcouponId, CandyCouponCode::getRedeemUid);
         List<CandyCouponCode> list = candyCouponCodeAdminService.list(couponCodeLambdaQueryWrapper);
 
         List<String> ccodeUpdateList = CollectionUtil.arrayListString();
@@ -166,6 +169,8 @@ public class CandyCouponCodeAdminController extends BaseController {
                 vos.removeIf(rv -> rv.getUcouponId().equals(r.getUcouponId()));
             }
 
+            redisUtil.set(uckey, vos);
+
             ccodeUpdateList.add(r.getUcouponId());
         });
 

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

@@ -92,7 +92,7 @@
 						if (row.state === 0) {
 							actions.push('<a class="btn btn-primary btn-xs ' + invalidFlag + '" href="javascript:void(0)" onclick="invalidHandler(\'' + row.ccode + '\')"><i class="fa fa-edit"></i>失效</a> ');
 						} else if (row.state === 1) {
-							actions.push('<a class="btn btn-danger btn-xs ' + recoverFlag + '" href="javascript:void(0)" onclick="recoverHandler(\'' + row.ccode + '\',' + row.ucouponId + '\')"><i class="fa fa-remove"></i>退回</a>');
+							actions.push('<a class="btn btn-danger btn-xs ' + recoverFlag + '" href="javascript:void(0)" onclick="recoverHandler(\'' + row.ccode + '\', \'' + row.ucouponId + '\')"><i class="fa fa-remove"></i>退回</a>');
 						}
 						return actions.join('');
 					}
@@ -113,17 +113,21 @@
 	
 	function invalidHandler(ccode) {
 		if (ccode !== null && ccode !== undefined) {
-			var data = {"couponId":couponId,"ccodes": ccode};
-			$.operate.submit('code/invalid', "post", "json", data);
+			$.modal.confirm("是否失效？", function() {
+				var data = {"couponId":couponId,"ccodes": ccode};
+				$.operate.submit('code/invalid', "post", "json", data);
+			});
 		} else {
 			$.operate.batchProcessingForCouponCode(couponId, 1);
 		}
 	}
 
 	function recoverHandler(ccode, ucouponId) {
-		if (ccode !== null && ccode !== undefined) {
-			var data = {"ucouponId":ucouponId,"couponId":couponId,"ccodes": ccode};
-			$.operate.submit('code/recover', "post", "json", data);
+		if (ccode !== null && ccode !== undefined && ucouponId !== null && ucouponId !== undefined) {
+			var data = {"ucouponIds": ucouponId, "couponId": couponId, "ccodes": ccode};
+			$.modal.confirm("是否退回？", function() {
+				$.operate.submit('code/recover', "post", "json", data);
+			});
 		}
 		// else {
 		// 	$.operate.batchProcessingForCouponCode(couponId, 2);