From 8d28b9aef51c54c5fdc861d9d62f96fb8efc908a Mon Sep 17 00:00:00 2001 From: zhaohengkun Date: Wed, 23 Oct 2024 09:07:36 +0800 Subject: [PATCH] 1 --- .../controller/CardCouponUserController.java | 11 +-- .../mapper/CardCouponUserMapper.java | 2 + .../mapper/xml/CardCouponUserMapper.xml | 14 ++++ .../service/CardCouponUserService.java | 2 +- .../impl/CardCouponUserServiceImpl.java | 6 +- fuintCashierWeb/src/api/online.js | 2 +- .../views/cashier/NewComponents/Integral.vue | 76 +++++-------------- .../views/cashier/NewComponents/WriteOff.vue | 24 +----- 8 files changed, 47 insertions(+), 90 deletions(-) diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardCoupon/controller/CardCouponUserController.java b/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardCoupon/controller/CardCouponUserController.java index 4a8e26fe9..ad0e683a8 100644 --- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardCoupon/controller/CardCouponUserController.java +++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardCoupon/controller/CardCouponUserController.java @@ -16,6 +16,7 @@ import org.springframework.web.bind.annotation.*; import javax.annotation.Resource; import java.io.Serializable; import java.util.List; +import java.util.Map; import static org.springframework.boot.actuate.autoconfigure.cloudfoundry.SecurityResponse.success; @@ -100,15 +101,15 @@ public class CardCouponUserController extends BaseController { } /** - * 根据 手机号 或 核销码 和 当前店铺id 以及 优惠券类型 兑换券 和 商品兑换券 来查询用户领取 并且 未核销的 + * 根据 手机号 或 核销码 和 当前店铺id 以及 优惠券类型 兑换券 和 商品兑换券 来查询用户领取 并且 未核销的 并且 在有效期时间段内 * @param str 手机号 / 核销码 */ - @GetMapping ("selectUserCardVerification") - public ResponseObject selectUserCardVerification(String str,@RequestParam (name = "couponType", required = false, defaultValue = "1,2") Integer[] couponType) { + @GetMapping ("/selectUserCardVerification") + public ResponseObject selectUserCardVerification(@RequestParam (name = "mobile", required = true) String str) { - List list = cardCouponUserService.selectUserCardVerification(str, couponType); + List> maps = cardCouponUserService.selectUserCardVerification(str); - return getSuccessResult(list); + return getSuccessResult(maps); } } diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardCoupon/mapper/CardCouponUserMapper.java b/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardCoupon/mapper/CardCouponUserMapper.java index fdff2dc97..39d2c1b6b 100644 --- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardCoupon/mapper/CardCouponUserMapper.java +++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardCoupon/mapper/CardCouponUserMapper.java @@ -45,5 +45,7 @@ public interface CardCouponUserMapper extends BaseMapper { List selectCardCouponUserList(@Param("params") Map params); + List> selectUserCardVerification(@Param("str") String str); + } diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardCoupon/mapper/xml/CardCouponUserMapper.xml b/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardCoupon/mapper/xml/CardCouponUserMapper.xml index ac8527997..b04a3974f 100644 --- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardCoupon/mapper/xml/CardCouponUserMapper.xml +++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardCoupon/mapper/xml/CardCouponUserMapper.xml @@ -55,6 +55,20 @@ + diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardCoupon/service/CardCouponUserService.java b/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardCoupon/service/CardCouponUserService.java index 5d0a3b309..515d7c1bb 100644 --- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardCoupon/service/CardCouponUserService.java +++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardCoupon/service/CardCouponUserService.java @@ -63,7 +63,7 @@ public interface CardCouponUserService extends IService { List selectListByUsed(Integer userId,List couponIdList); - List selectUserCardVerification(String str, Integer[] couponType); + List> selectUserCardVerification(String str); } diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardCoupon/service/impl/CardCouponUserServiceImpl.java b/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardCoupon/service/impl/CardCouponUserServiceImpl.java index 296c419b5..b0c3fd3fa 100644 --- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardCoupon/service/impl/CardCouponUserServiceImpl.java +++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardCoupon/service/impl/CardCouponUserServiceImpl.java @@ -182,8 +182,10 @@ public class CardCouponUserServiceImpl extends ServiceImpl selectUserCardVerification(String str, Integer[] couponType) { - return null; + public List> selectUserCardVerification(String str) { + + List> maps = cardCouponUserMapper.selectUserCardVerification(str); + return maps; } } diff --git a/fuintCashierWeb/src/api/online.js b/fuintCashierWeb/src/api/online.js index b31763198..c8d3ec509 100644 --- a/fuintCashierWeb/src/api/online.js +++ b/fuintCashierWeb/src/api/online.js @@ -3,7 +3,7 @@ import request from '@/utils/request' // 领取记录列表 export function listRecord(query) { return request({ - url: 'business/marketingActivity/cardExchangeRecord', + url: '/cardCouponUser/selectUserCardVerification', method: 'get', params: query }) diff --git a/fuintCashierWeb/src/views/cashier/NewComponents/Integral.vue b/fuintCashierWeb/src/views/cashier/NewComponents/Integral.vue index 849f0a639..a5591a639 100644 --- a/fuintCashierWeb/src/views/cashier/NewComponents/Integral.vue +++ b/fuintCashierWeb/src/views/cashier/NewComponents/Integral.vue @@ -4,51 +4,6 @@
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
@@ -80,7 +35,7 @@
-
重置会员
+
重置会员
@@ -127,8 +82,8 @@
-
扫码支付
-
{{ allPoints }}
+
支付金额
+
{{ allAmout }}
@@ -529,10 +484,10 @@
积分合计：
{{ allPoints }}
-
-
总价合计：
-
￥{{ allAmout }}
-
+ + + +
@@ -811,11 +766,11 @@ export default { // return this.gradeName; // }, // 重置会员 - resetMember() { - this.member = {} - this.isMember = false - this.userNo = '' - }, + // resetMember() { + // this.member = {} + // this.isMember = false + // this.userNo = '' + // }, // 获取当前账户信息 getStaff() { staffInfo().then(response => { @@ -847,8 +802,7 @@ export default { this.getGiftCategory() await this.getGift() - // this.paymentType = '' - this.resetMember() + this.restVipUser() }, // 打开购物车 shoppingCartMethod() { @@ -1078,7 +1032,10 @@ export default { this.isPay = true this.dialogVisiblej = true if (this.paymentType !== 'CASH') { + + console.log("当前应付金额", this.allAmout) if (this.allAmout != 0) { + console.log("进去了") // 发送扫码机请求（易联云网络下发） await this.getSendPrintIndex(this.allAmout) this.getCode(this.allAmout) @@ -1181,6 +1138,7 @@ export default { }) let flag = false let orderNumber = '' + // 调用接口 插入订单状态 并进行支付 await getIntegralOrdersProcessingApi({ integralOrdersList: integralOrdersList, authCode: this_.authCode, diff --git a/fuintCashierWeb/src/views/cashier/NewComponents/WriteOff.vue b/fuintCashierWeb/src/views/cashier/NewComponents/WriteOff.vue index ecd78e186..ee5f171de 100644 --- a/fuintCashierWeb/src/views/cashier/NewComponents/WriteOff.vue +++ b/fuintCashierWeb/src/views/cashier/NewComponents/WriteOff.vue @@ -23,6 +23,7 @@
+
{{item.exchangeName}}
领取人： {{item.mobile || '匿名'}}
核销码： {{item.ticketCode}}
@@ -56,24 +57,7 @@ export default { ], num:13964068390, queryParams : { - pageNum: 1, - pageSize: 999, - cardExchangeId: null, - mtStaffId: null, - realName: null, - staffMobile: null, - mtUserId: null, - name: null, mobile: null, - photo: null, - exchangeName: null, - ticketCode: null, - exchangeFrom: null, - status: 0, - outTime: null, - cancelTime: null, - startTime: null, - endTime: null, }, couponList:[], recordList:[], @@ -95,13 +79,9 @@ export default { } this.loading = true; listRecord(this.queryParams).then(response => { - this.couponList = response.data.records; + this.couponList = response.data; this.total = response.data.total - if( response.data.total == 0){ - }else{ - - } this.loading = false; }); },