优惠券

snowy-admin-web/src/views/biz/couponrecord/index.vue

@@ -50,6 +50,19 @@
 						</a-popconfirm>
 					</a-space>
 				</template>
+				<template v-if="column.dataIndex === 'couponStatus'">
+					<a-tag
+						:color="
+							record.couponStatus === '0'
+								? '#87d068'
+								: record.couponStatus === '1'
+								  ? '#f50'
+								      : '#f50'
+						"
+					>
+						{{ $TOOL.dictTypeData('is_destroy', record.couponStatus) }}
+					</a-tag>
+				</template>
 			</template>
 		</s-table>
 	</a-card>

snowy-admin-web/src/views/biz/member/consumption.vue

@@ -63,6 +63,10 @@
 	// 打开抽屉
 	const onOpen = (record) => {
 		open.value = true
+		clearInterval(timer);
+		isDisabled.value = false;
+		countdown.value = 300;
+		isDisabled.value = false
 		if (record) {
 			let recordData = cloneDeep(record)
 			formData.value = Object.assign({}, recordData)
@@ -115,7 +119,7 @@
 			message.error('请先输入手机号！')
 			return
 		}
-		bizAuthApi.sendMessage({phone:formData.value.phoneNumber}).then((res)=>{
+		//bizAuthApi.sendMessage({phone:formData.value.phoneNumber}).then((res)=>{
 			/*if(res.code == '200'){
 				message.success("发送成功")
 			}else{
@@ -134,7 +138,7 @@
 					countdown.value = 300;
 				}
 			}, 1000);
-		})
+		//})
 	}
 	// 抛出函数
 	defineExpose({

snowy-plugin/snowy-plugin-biz/src/main/java/vip/xiaonuo/biz/modular/couponrecord/controller/BizCouponRecordController.java

@@ -130,7 +130,7 @@ public class BizCouponRecordController {
     @Operation(summary = "根据编码获取优惠券记录列表")
     @SaCheckPermission("/biz/couponrecord/queryByCode")
     @GetMapping("/biz/couponrecord/queryByCode")
-    public CommonResult<List<BizCouponRecord>> queryByCode(@Valid BizCouponRecordPageParam bizCouponRecordPageParam) {
+    public CommonResult<BizCouponRecord> queryByCode(@Valid BizCouponRecordPageParam bizCouponRecordPageParam) {
         return CommonResult.data(bizCouponRecordService.queryByCode(bizCouponRecordPageParam));
     }
 

snowy-plugin/snowy-plugin-biz/src/main/java/vip/xiaonuo/biz/modular/couponrecord/service/BizCouponRecordService.java

@@ -83,7 +83,7 @@ public interface BizCouponRecordService extends IService<BizCouponRecord> {
      * @param bizCouponRecordPageParam
      * @return
      */
-    List<BizCouponRecord> queryByCode(BizCouponRecordPageParam bizCouponRecordPageParam);
+    BizCouponRecord queryByCode(BizCouponRecordPageParam bizCouponRecordPageParam);
 
     /**优惠券核销*/
     void destroy(BizCouponRecordEditParam bizCouponRecordEditParam);

snowy-plugin/snowy-plugin-biz/src/main/java/vip/xiaonuo/biz/modular/couponrecord/service/impl/BizCouponRecordServiceImpl.java

@@ -102,9 +102,11 @@ public class BizCouponRecordServiceImpl extends ServiceImpl<BizCouponRecordMappe
     }
 
     @Override
-    public List<BizCouponRecord> queryByCode(BizCouponRecordPageParam bizCouponRecordPageParam) {
-        List<BizCouponRecord> bizCouponRecord = this.list(new QueryWrapper<BizCouponRecord>().lambda().
-                like(BizCouponRecord::getCouponNo, bizCouponRecordPageParam.getCouponNo()));
+    public BizCouponRecord queryByCode(BizCouponRecordPageParam bizCouponRecordPageParam) {
+        BizCouponRecord bizCouponRecord = this.getOne(new QueryWrapper<BizCouponRecord>().lambda().
+                eq(BizCouponRecord::getCouponNo, bizCouponRecordPageParam.getCouponNo()).
+                eq(BizCouponRecord::getCouponStatus,"0").
+                last("limit 1"));
         return bizCouponRecord;
     }