diff --git a/fuintAdmin/src/App.vue b/fuintAdmin/src/App.vue index b719ee683..3c015dd66 100644 --- a/fuintAdmin/src/App.vue +++ b/fuintAdmin/src/App.vue @@ -21,6 +21,8 @@ .app-container{ width: 100%; background: #f6f8f9; + box-sizing: border-box; + padding: 10px; } diff --git a/fuintAdmin_zt/src/views/setting/banner/index.vue b/fuintAdmin_zt/src/views/setting/banner/index.vue index 79a01984d..fae5ff097 100644 --- a/fuintAdmin_zt/src/views/setting/banner/index.vue +++ b/fuintAdmin_zt/src/views/setting/banner/index.vue @@ -11,32 +11,12 @@ @keyup.enter.native="handleQuery" /> - - - - - - - - - - - - - - - - - - - - 搜索 重置 @@ -49,13 +29,7 @@ - - - - - - -
+
@@ -510,5 +484,10 @@ export default { align-items: center; height: 100%; } +.app-container{ + box-sizing: border-box; + padding: 10px ; + +} diff --git a/fuintAdmin_zt/src/views/setting/message.vue b/fuintAdmin_zt/src/views/setting/message.vue index e4fcd1877..e9d623f77 100644 --- a/fuintAdmin_zt/src/views/setting/message.vue +++ b/fuintAdmin_zt/src/views/setting/message.vue @@ -37,7 +37,7 @@ -
+
@@ -390,5 +390,9 @@ export default { width: 98px; height: 98px; } +.app-container{ + box-sizing: border-box; + padding: 10px; +} diff --git a/fuintAdmin_zt/src/views/system/notify/page/getNotify.vue b/fuintAdmin_zt/src/views/system/notify/page/getNotify.vue index a6847ac3a..430bd180f 100644 --- a/fuintAdmin_zt/src/views/system/notify/page/getNotify.vue +++ b/fuintAdmin_zt/src/views/system/notify/page/getNotify.vue @@ -23,20 +23,19 @@ 重置 - - - - - - - - - - - - - - +
+ + + + + + + + + + +
+ diff --git a/fuintAdmin_zt/src/views/system/notify/page/mode.vue b/fuintAdmin_zt/src/views/system/notify/page/mode.vue index 9db7f27d9..bf58afe30 100644 --- a/fuintAdmin_zt/src/views/system/notify/page/mode.vue +++ b/fuintAdmin_zt/src/views/system/notify/page/mode.vue @@ -480,7 +480,7 @@ export default { } .table_box{ width: 100%; - height: 69vh; + height: 70vh; } diff --git a/fuintAdmin_zt/src/views/system/notify/page/record.vue b/fuintAdmin_zt/src/views/system/notify/page/record.vue index b32c8e333..62e2b08ad 100644 --- a/fuintAdmin_zt/src/views/system/notify/page/record.vue +++ b/fuintAdmin_zt/src/views/system/notify/page/record.vue @@ -576,7 +576,7 @@ export default { } .table_box{ width: 100%; - height: 69vh; + height: 70vh; } 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 41361e69d..10186cae7 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 @@ -124,5 +124,14 @@ public class CardCouponUserController extends BaseController { return getSuccessResult(maps); } + + /** + * 分页查询已核销记录列表 + */ + @GetMapping("/selectVerifiedList") + public ResponseObject selectVerifiedList(Page page,CardCouponUser cardCouponUser) { + return getSuccessResult(this.cardCouponUserService.selectVerifiedList(page, cardCouponUser)); + } + } diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardCoupon/entity/CardCouponUser.java b/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardCoupon/entity/CardCouponUser.java index 26f3ead29..3495c9c41 100644 --- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardCoupon/entity/CardCouponUser.java +++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardCoupon/entity/CardCouponUser.java @@ -7,6 +7,7 @@ import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.extension.activerecord.Model; import com.fasterxml.jackson.annotation.JsonFormat; import lombok.Data; +import org.springframework.data.annotation.Transient; import java.io.Serializable; @@ -59,6 +60,23 @@ public class CardCouponUser extends Model { //核销码 private String verificationCode; + /** + * 优惠券名称 + */ + @Transient + private String name; + /** + * 优惠券类型 + */ + @Transient + private String type; + + @Transient + @JsonFormat(pattern = "yyyy-MM-dd" , timezone = "GMT+8") + private String begin; + @Transient + @JsonFormat(pattern = "yyyy-MM-dd" , timezone = "GMT+8") + private String end; } 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 1c6640360..45a55c0ed 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 @@ -52,6 +52,6 @@ public interface CardCouponUserMapper extends BaseMapper { CardCouponUserVo selectOneCardName(Integer id); - + IPage selectVerifiedList(Page page, @Param("obj")CardCouponUser cardCouponUser); } 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 6afc9f212..3ef351cf5 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 @@ -57,12 +57,13 @@ SELECT userCard.id as id, mtUser.NAME as mobile, userCard.verification_code as ticketCode, + CONCAT(userCard.start_time, '-', userCard.end_time) as exchangeFrom, card.name as exchangeName, card.exchange_content as exchangeContent FROM (SELECT * FROM card_coupon_user WHERE mobile = #{str} OR verification_code = #{str}) userCard INNER JOIN card_coupon card ON userCard.card_coupon_id = card.id LEFT JOIN mt_user mtUser ON mtUser.id = userCard.mt_user_id - WHERE card.type IN (2, 5) + WHERE card.type = '2' AND userCard.STATUS = 0 AND userCard.start_time <= NOW() AND userCard.end_time >= NOW() @@ -80,6 +81,49 @@ JOIN card_coupon cc on cu.card_coupon_id = cc.id where cu.id = #{id} + 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 19ea74bc6..8261fea31 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 @@ -3,6 +3,7 @@ package com.fuint.business.marketingActivity.cardCoupon.service; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.IService; +import com.fuint.business.marketingActivity.activeApplet.entity.ActiveApplet; import com.fuint.business.marketingActivity.cardCoupon.entity.CardCouponUser; import com.fuint.business.marketingActivity.cardCoupon.vo.CardCouponUserVo; import com.fuint.business.marketingActivity.cardCoupon.vo.CardCouponVO; @@ -69,5 +70,6 @@ public interface CardCouponUserService extends IService { List> selectUserCardVerification(String str); + IPage selectVerifiedList(Page page, CardCouponUser cardCouponUser); } 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 1b1a8758e..4aa011a5b 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 @@ -193,5 +193,10 @@ public class CardCouponUserServiceImpl extends ServiceImpl> maps = cardCouponUserMapper.selectUserCardVerification(str); return maps; } + + @Override + public IPage selectVerifiedList(Page page, CardCouponUser cardCouponUser) { + return cardCouponUserMapper.selectVerifiedList(page, cardCouponUser); + } } diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardCoupon/vo/CardCouponUserVo.java b/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardCoupon/vo/CardCouponUserVo.java index 35330311b..39f240b8f 100644 --- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardCoupon/vo/CardCouponUserVo.java +++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardCoupon/vo/CardCouponUserVo.java @@ -14,6 +14,25 @@ public class CardCouponUserVo extends CardCouponUser { * 卡券类型 1代金券、2兑换券、3折扣券、4油品立减券、5单品代金券 */ private String type; + + /** + * 有效期 + */ + private String effectiveTime; + + /** + * 可用时间 + */ + private String availableTime; + + /** + * 兑换内容 + */ + private String exchangeContent; + /** + * 核销时间 + */ + private String verificationTime; /** * 使用条件 */ diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/controller/AllOrderInfoController.java b/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/controller/AllOrderInfoController.java index 32ec2d3fa..f06862263 100644 --- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/controller/AllOrderInfoController.java +++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/controller/AllOrderInfoController.java @@ -519,7 +519,7 @@ public class AllOrderInfoController extends BaseController { this.allOrderInfoService.exportExcelBackOrderMsgsApi(response, allOrderInfoRes); } - +` /** * 交易对账 * 交易明细分页查询 diff --git a/fuintCashierWeb/src/api/online.js b/fuintCashierWeb/src/api/online.js index 26544699a..36f601468 100644 --- a/fuintCashierWeb/src/api/online.js +++ b/fuintCashierWeb/src/api/online.js @@ -60,3 +60,12 @@ export function delRecord(id) { method: 'delete' }) } + +// 已核销记录列表 +export function selectVerifiedList(query) { + return request({ + url: '/cardCouponUser/selectVerifiedList', + method: 'get', + params: query + }) +} diff --git a/fuintCashierWeb/src/views/cashier/NewComponents/Integral.vue b/fuintCashierWeb/src/views/cashier/NewComponents/Integral.vue index d97b7912a..dcd752493 100644 --- a/fuintCashierWeb/src/views/cashier/NewComponents/Integral.vue +++ b/fuintCashierWeb/src/views/cashier/NewComponents/Integral.vue @@ -12,16 +12,22 @@
{{ chooseVipUser.name || '匿名' }}
{{ chooseVipUser.mobile }} - 普通会员 + {{ chooseVipUser.gradeName }} -
储值卡：￥1000.00
-
储值卡：￥1000.00
-
储值卡：￥1000.00
-
储值卡：￥1000.00
-
储值卡：￥1000.00
+
储值卡：￥{{ chooseVipUser.cardBalance || 0 }}
+
+
+ 囤油卡：{{item.oilNumberName}} {{item.fuelAmount}}升 +
+
+
+
+ 车队卡：￥{{ chooseVipUser.fleetMember.remainingCreditLimit }} +
+
diff --git a/fuintCashierWeb/src/views/cashier/NewComponents/writeList.vue b/fuintCashierWeb/src/views/cashier/NewComponents/writeList.vue index 41c42efc0..2e1c7bd32 100644 --- a/fuintCashierWeb/src/views/cashier/NewComponents/writeList.vue +++ b/fuintCashierWeb/src/views/cashier/NewComponents/writeList.vue @@ -5,42 +5,59 @@
- + - + + + + + + + + + + + + + + + + + - + - - 至 - + placeholder="开始日期"> - - + 至 + + +
- 查询 - 重置 + 查询 + 重置
@@ -50,16 +67,16 @@ border style="width: 100%"> - - - - - - - - - - + + + + + + + + + +