dianliang/oil-station
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

1

Browse Source
This commit is contained in:
zhaohengkun 2024-10-23 09:07:36 +08:00
parent a625342084
commit 8d28b9aef5
8 changed files with 47 additions and 90 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardCoupon/controller/CardCouponUserController.java
View File

@ -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<CardCouponUser> list = cardCouponUserService.selectUserCardVerification(str, couponType);
List<Map<String, Object>> maps = cardCouponUserService.selectUserCardVerification(str);
return getSuccessResult(list);
return getSuccessResult(maps);
}
}

2
fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardCoupon/mapper/CardCouponUserMapper.java
View File

@ -45,5 +45,7 @@ public interface CardCouponUserMapper extends BaseMapper<CardCouponUser> {
List<CardCouponUser> selectCardCouponUserList(@Param("params") Map<String, Object> params);
List<Map<String, Object>> selectUserCardVerification(@Param("str") String str);
}

14
fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardCoupon/mapper/xml/CardCouponUserMapper.xml
View File

@ -55,6 +55,20 @@
</if>
</where>
</select>
<select id="selectUserCardVerification" resultType="map">
SELECT
mtUser.NAME as mobile ,
userCard.verification_code as ticketCode ,
card.name as exchangeName
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 )
AND userCard.STATUS = 0
AND userCard.start_time &lt;= NOW() AND userCard.end_time &gt;= NOW()
</select>
</mapper>

2
fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardCoupon/service/CardCouponUserService.java
View File

@ -63,7 +63,7 @@ public interface CardCouponUserService extends IService<CardCouponUser> {
List<CardCouponUser> selectListByUsed(Integer userId,List<Integer> couponIdList);
List<CardCouponUser> selectUserCardVerification(String str, Integer[] couponType);
List<Map<String, Object>> selectUserCardVerification(String str);
}

6
fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardCoupon/service/impl/CardCouponUserServiceImpl.java
View File

@ -182,8 +182,10 @@ public class CardCouponUserServiceImpl extends ServiceImpl<CardCouponUserMapper,
}
@Override
public List<CardCouponUser> selectUserCardVerification(String str, Integer[] couponType) {
return null;
public List<Map<String, Object>> selectUserCardVerification(String str) {
List<Map<String, Object>> maps = cardCouponUserMapper.selectUserCardVerification(str);
return maps;
}
}

2
fuintCashierWeb/src/api/online.js
View File

@ -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
})

76
fuintCashierWeb/src/views/cashier/NewComponents/Integral.vue
View File

@ -4,51 +4,6 @@
<div class="center-left">
<div class="center-vh">
<div class="center-left-top">
<!-- <div class="vip-bottom" v-if="isMember == false" @click="dialogVisiblevip = true">-->
<!-- <div>会员搜索</div>-->
<!-- </div>-->
<!-- <div v-else style="width: 96%;margin: 0 auto;display: flex;justify-content: space-between">-->
<!-- <div-->
<!-- style="display: flex;color: white;justify-content: space-around;width: 55%;-->
<!-- height: 90%;border-radius: 10px;-->
<!-- padding-top: 10px;-->
<!-- background-color: rgb(67,119,204)">-->
<!-- <div>-->
<!-- <template>-->
<!-- <img v-if="member.avatar" class="list-avatar" :src="baseUrl + member.avatar">-->
<!-- <img v-else class="list-avatar" src="@/assets/images/avatar.png">-->
<!-- </template>-->
<!-- </div>-->
<!-- <div style="text-align: center">-->
<!-- <span style="margin-bottom: 10px">{{ member.name }}</span><br/>-->
<!-- <span>{{ member.mobile }}</span>-->
<!-- </div>-->
<!-- <div style="background-color: rgba(46,82,142,0.65);width: 50px;height: 45px;padding-top: 5px;-->
<!-- border-radius: 5px;text-align: center">-->
<!-- <el-tooltip placement="top">-->
<!-- <div slot="content">-->
<!-- <p>会员储值账户余额：{{ member.cardBalance }}</p>-->
<!-- <p>积分余额：{{ member.points }}</p>-->
<!-- </div>-->
<!-- <i class="el-icon-bank-card" style="font-size: 35px"></i>-->
<!-- </el-tooltip>-->
<!-- </div>-->
<!-- <div style="background-color: rgba(46,82,142,0.65);width: 50px;height: 45px;padding-top: 5px;-->
<!-- border-radius: 5px;text-align: center">-->
<!-- <el-tooltip placement="top">-->
<!-- <div slot="content">-->
<!-- 会员等级：{{ gradeName }}-->
<!-- </div>-->
<!-- <i class="el-icon-medal" style="font-size: 35px"></i>-->
<!-- </el-tooltip>-->
<!-- </div>-->
<!-- </div>-->
<!-- <div class="vip-bottom" style="height: 40px;margin-top: 10px" @click="resetMember">-->
<!-- <div>重置会员</div>-->
<!-- </div>-->
<!-- </div>-->
<!---->
<div class="o-top" v-if="userInfo">
<div style="width: 50%">
<div class="d-s">
@ -80,7 +35,7 @@
</div>
<div class="d-s" style="width: 50%">
<div class="an_bor" @click="restVipUser">重置会员</div>
<div class="an_bor" @click="restVipUser">重置会员</div>
</div>
</div>
<div class="o-top" v-if="!userInfo">
@ -127,8 +82,8 @@
</div>
<div class="center-left-th">
<div class="th-box">
<div>扫码支付</div>
<div class="bule">{{ allPoints }}</div>
<div>支付金额</div>
<div class="bule">{{ allAmout }}</div>
</div>
<!-- <div class="th-box">-->
<!-- <div @click="dialogVisible = true">操作员</div>-->
@ -529,10 +484,10 @@
<div>积分合计：</div>
<div>{{ allPoints }}</div>
</div>
<div class="input-box" v-if="allAmout">
<div>总价合计：</div>
<div>￥{{ allAmout }}</div>
</div>
<!-- <div class="input-box" v-if="allAmout">-->
<!-- <div>总价合计：</div>-->
<!-- <div>￥{{ allAmout }}</div>-->
<!-- </div>-->
</div>
</div>
@ -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,

24
fuintCashierWeb/src/views/cashier/NewComponents/WriteOff.vue
View File

@ -23,6 +23,7 @@
<div class="coupon-box" @click="getcardExchangeRecord(item.id)" v-for="(item,index) in couponList" :key="index">
<div style="margin-left: 30%;width: 57%">
<!-- 券名称 -->
<div class="box-hei">{{item.exchangeName}} </div>
<div class="box-hui"><span>领取人：</span> <span>{{item.mobile || '匿名'}}</span> </div>
<div class="box-hui"><span>核销码：</span> <span>{{item.ticketCode}}</span> </div>
@ -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;
});
},