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

Merge remote-tracking branch 'origin/master'

Browse Source
This commit is contained in:
齐天大圣 2024-06-04 15:20:18 +08:00
commit 9b6124594a
18 changed files with 114 additions and 53 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
fuintAdmin/src/views/member/index.vue
View File

@ -568,7 +568,7 @@ export default {
status: [{ required: true, message: "请选择会员状态", trigger: "blur" }],
mobile: [
{ required: true, message: "请输入手机号", trigger: "blur" },
{ min: 8, max: 11, message: '请输入正确的手机号', trigger: 'blur' }
{ min: 11, max: 11, message: '请输入正确的手机号', trigger: 'blur' }
],
}
};

6
fuintAdmin/src/views/setting/print/index.vue
View File

@ -114,7 +114,7 @@
<!-- </el-form-item>-->
<el-form-item label="isAcquiesce" prop="isAcquiesce">
<el-switch
v-model="deviceInfo.isAcquiesce"
v-model="deviceInfo.acquiesce"
active-color="#13ce66"
inactive-color="#ff4949">
</el-switch>
@ -150,7 +150,7 @@ export default {
appPublicKey: '', // 应用公钥(key)
platformPublicKey: '', // 平台公钥(publicKey)
accessToken: '', // token
isAcquiesce: false // token
acquiesce: false // token
},
// 是否显示弹出层
open: false,
@ -271,7 +271,7 @@ export default {
appPublicKey: '', // 应用公钥(key)
platformPublicKey: '', // 平台公钥(publicKey)
accessToken: '' , // token
isAcquiesce: false // token
acquiesce: false // token
}
},
}

4
fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardFule/service/impl/CardFuelRecordServiceImpl.java
View File

@ -32,6 +32,7 @@ import com.fuint.business.marketingActivity.cardFuleOrders.service.CardFuleOrder
import com.fuint.business.marketingActivity.cardValue.entity.CardValueRecord;
import com.fuint.business.marketingActivity.cardValue.mapper.CardValueRecordMapper;
import com.fuint.business.marketingActivity.cardValue.service.CardValueRecordService;
import com.fuint.business.marketingActivity.cardValueOrders.service.CardValueOrdersService;
import com.fuint.business.member.entity.LJStaff;
import com.fuint.business.member.service.ILJStaffService;
import com.fuint.business.order.entity.AllOrderInfo;
@ -111,6 +112,8 @@ public class CardFuelRecordServiceImpl implements CardFuelRecordService {
private ILJStoreService storeService;
@Resource
private StaffCommissionService staffCommissionService;
@Resource
private CardValueOrdersService cardValueOrdersService;
/**
* 通过ID查询单条数据
*
@ -266,6 +269,7 @@ public class CardFuelRecordServiceImpl implements CardFuelRecordService {
if ("CASH".equals(cardFuelRecordDTO.getPaymentType())) {
AllOrderInfo allOrderInfo = getAllOrderInfo(cardFuelRecordDTO);
allOrderInfoService.insertAllOrderInfo(allOrderInfo);
cardValueOrdersService.updateBalances(orderNo,"paid");
}
double theAmountToBePaid = 0.0;

1
fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardValueOrders/service/CardValueOrdersService.java
View File

@ -35,5 +35,6 @@ public interface CardValueOrdersService extends IService<CardValueOrders> {
void updateOrderStatus(String orderNo,String status);
void updateBalance(String orderNo,String status);
void updateBalances(String orderNo,String status);
}

24
fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardValueOrders/service/impl/CardValueOrdersServiceImpl.java
View File

@ -7,6 +7,9 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.fuint.business.marketingActivity.cardValueOrders.entity.CardValueOrders;
import com.fuint.business.marketingActivity.cardValueOrders.mapper.CardValueOrdersMapper;
import com.fuint.business.marketingActivity.cardValueOrders.service.CardValueOrdersService;
import com.fuint.business.order.mapper.AllOrderInfoMapper;
import com.fuint.business.order.service.AllOrderInfoService;
import com.fuint.business.order.vo.AllOrderInfoVo;
import com.fuint.business.userManager.entity.UserBalance;
import com.fuint.business.userManager.service.UserBalanceService;
import com.fuint.common.dto.AccountInfo;
@ -29,6 +32,9 @@ public class CardValueOrdersServiceImpl extends ServiceImpl<CardValueOrdersMappe
@Resource
private UserBalanceService userBalanceService;
@Resource
private AllOrderInfoService allOrderInfoService;
/**
* 根据订单编号返回订单信息
* @param orderNo
@ -75,5 +81,23 @@ public class CardValueOrdersServiceImpl extends ServiceImpl<CardValueOrdersMappe
baseMapper.updateById(oneByOrderNo);
}
}
@Resource
AllOrderInfoMapper allOrderInfoMapper;
@Override
public void updateBalances(String orderNo, String status) {
AllOrderInfoVo oneByOrderNo = allOrderInfoService.getOneByOrderNo(orderNo);
if (ObjectUtil.isNotEmpty(oneByOrderNo)){
if ("paid".equals(status)){
UserBalance userBalance = userBalanceService.selectUserBalanceByStorId(oneByOrderNo.getUserId(),oneByOrderNo.getStoreId());
Double cardBalance = 0.0;
cardBalance = userBalance.getCardBalance() + oneByOrderNo.getPayMoney();
userBalance.setCardBalance(cardBalance);
userBalanceService.updateUserBalance(userBalance);
}
oneByOrderNo.setStatus(status);
allOrderInfoMapper.updateById(oneByOrderNo);
}
}
}

2
fuintBackend/fuint-application/src/main/java/com/fuint/business/order/controller/AllOrderInfoController.java
View File

@ -223,7 +223,7 @@ public class AllOrderInfoController extends BaseController {
@GetMapping("getIndexData4Pos")
public ResponseObject getIndexData4Pos(){
AllOrderInfoVo indexData4Pos = allOrderInfoService.getIndexData4Pos();
// AllOrderInfoVo indexData4Pos = allOrderInfoService.getIndexData4Pos();
return getSuccessResult(allOrderInfoService.getIndexData4Pos());
}
@GetMapping("getOperatingDataPos")

3
fuintBackend/fuint-application/src/main/java/com/fuint/business/order/mapper/AllOrderInfoMapper.java
View File

@ -3,6 +3,7 @@ package com.fuint.business.order.mapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.fuint.business.marketingActivity.cardValueOrders.entity.CardValueOrders;
import com.fuint.business.order.dto.AllOrderInfoDto;
import com.fuint.business.order.entity.AllOrderInfo;
import com.fuint.business.order.entity.CardBalanceChange;
@ -49,4 +50,6 @@ public interface AllOrderInfoMapper extends BaseMapper<AllOrderInfo> {
AllOrderInfoVo getIndexData4Pos(@Param("allOrderInfo") AllOrderInfoDto allOrderInfo);
AllOrderInfoVo getHandOverList(HandoverRecord record);
AllOrderInfoVo getOneByOrderNo(String orderNo);
}

19
fuintBackend/fuint-application/src/main/java/com/fuint/business/order/mapper/xml/AllOrderInfoMapper.xml
View File

@ -321,10 +321,10 @@
SUM(CASE WHEN aoi.content = '油品充值' THEN pay_money ELSE 0 END) AS oilBalance,
COUNT(CASE WHEN aoi.content = '油品充值' THEN 0 END) AS oilBalanceCount,
SUM(CASE WHEN aoi.content = '储值卡订单' and pay_type = 'WECHAT' THEN pay_money ELSE 0 END) AS userBalanceByWechat,
COUNT(CASE WHEN aoi.content = '储值卡订单' and pay_type = 'WECHAT' THEN 0 END) AS userBalanceCountByWechat,
SUM(CASE WHEN aoi.content = '储值卡订单' and pay_type = 'ALIPAY' THEN pay_money ELSE 0 END) AS userBalanceByAli,
COUNT(CASE WHEN aoi.content = '储值卡订单' and pay_type = 'ALIPAY' THEN 0 END) AS userBalanceCountByali
SUM(CASE WHEN (aoi.content = '储值卡订单' or aoi.content = '油品充值') and pay_type = 'WECHAT' THEN pay_money ELSE 0 END) AS userBalanceByWechat,
COUNT(CASE WHEN (aoi.content = '储值卡订单' or aoi.content = '油品充值') and pay_type = 'WECHAT' and pay_type = 'WECHAT' THEN 0 END) AS userBalanceCountByWechat,
SUM(CASE WHEN (aoi.content = '储值卡订单' or aoi.content = '油品充值') and pay_type = 'ALIPAY' THEN pay_money ELSE 0 END) AS userBalanceByAli,
COUNT(CASE WHEN (aoi.content = '储值卡订单' or aoi.content = '油品充值') and pay_type = 'ALIPAY' THEN 0 END) AS userBalanceCountByali
@ -373,7 +373,7 @@
FROM
all_order_info
where store_id = #{allOrderInfo.storeId}
AND pay_time = CURDATE()
AND DATE(pay_time) = CURDATE()
</select>
<select id="getHandOverList" resultType="com.fuint.business.order.vo.AllOrderInfoVo">
SELECT
@ -395,6 +395,13 @@
</if>
</where>
</select>
<select id="getOneByOrderNo" resultType="com.fuint.business.order.vo.AllOrderInfoVo">
SELECT
*
from all_order_info
where order_no = #{orderNo}
</select>
<!-- WHERE-->
<!-- DATE(pay_time) = CURDATE();-->
<!-- <if test="startTime != null ">&lt;!&ndash; 开始时间检索 &ndash;&gt;-->
@ -411,4 +418,4 @@
<!-- <if test="endTime1 != null and endTime1 != ''">-->
<!-- AND pay_time &lt;= #{endTime} &#45;&#45; 结束时间检索-->
<!-- </if>-->
</mapper>
</mapper>

2
fuintBackend/fuint-application/src/main/java/com/fuint/business/order/service/AllOrderInfoService.java
View File

@ -2,6 +2,7 @@ package com.fuint.business.order.service;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.fuint.business.marketingActivity.cardValueOrders.entity.CardValueOrders;
import com.fuint.business.order.dto.AllOrderInfoDto;
import com.fuint.business.order.entity.AllOrderInfo;
import com.fuint.business.order.entity.CashierOrder;
@ -92,4 +93,5 @@ public interface AllOrderInfoService {
AllOrderInfoVo getIndexData4Pos();
AllOrderInfoVo getOperatingDataPos(AllOrderInfoDto allOrderInfo);
AllOrderInfoVo getOneByOrderNo(String orderNo);
}

5
fuintBackend/fuint-application/src/main/java/com/fuint/business/order/service/impl/AllOrderInfoServiceImpl.java
View File

@ -14,6 +14,7 @@ import com.fuint.business.convenienceSore.dto.LJGoodsDto;
import com.fuint.business.convenienceSore.service.LJGoodsService;
import com.fuint.business.convenienceSore.service.StockTrackService;
import com.fuint.business.marketingActivity.cardFavorable.service.CardFavorableRecordService;
import com.fuint.business.marketingActivity.cardValueOrders.entity.CardValueOrders;
import com.fuint.business.order.dto.AllOrderInfoDto;
import com.fuint.business.order.entity.*;
import com.fuint.business.order.mapper.AllOrderInfoMapper;
@ -955,6 +956,10 @@ public class AllOrderInfoServiceImpl extends ServiceImpl<AllOrderInfoMapper,AllO
}
@Override
public AllOrderInfoVo getOneByOrderNo(String orderNo) {
return allOrderInfoMapper.getOneByOrderNo(orderNo);
}
private long dayCount(String beginTimeStr, String endTimeStr ) {

5
fuintBackend/fuint-application/src/main/java/com/fuint/business/order/service/impl/OilOrderServiceImpl.java
View File

@ -1325,6 +1325,7 @@ public class OilOrderServiceImpl extends ServiceImpl<OilOrderMapper, OilOrder> i
res.put("error", "储值卡余额不足！");
}
}
res.put("orderNo", orderNo);
return res;
}
@ -1410,7 +1411,7 @@ public class OilOrderServiceImpl extends ServiceImpl<OilOrderMapper, OilOrder> i
addGrowthVal = addVal;
growthAfter = growth + addVal;
// 如果会员成长值达到会员等级成长值，则修改会员的会员等级信息
for (int i = 0; i < records.size(); i++) {
for (int i = 1; i < records.size(); i++) {
if (growthAfter < records.get(i).getGrowthValue()) {
balance.setGradeId(records.get(i - 1).getId());
break;
@ -1953,7 +1954,7 @@ public class OilOrderServiceImpl extends ServiceImpl<OilOrderMapper, OilOrder> i
addGrowthVal = addVal;
growthAfter = growth + addVal;
// 如果会员成长值达到会员等级成长值，则修改会员的会员等级信息
for (int i = 0; i < records.size(); i++) {
for (int i = 1; i < records.size(); i++) {
if (growthAfter < records.get(i).getGrowthValue()) {
balance.setGradeId(records.get(i - 1).getId());
break;

2
fuintBackend/fuint-application/src/main/java/com/fuint/business/printer/entity/PrintDeviceInfo.java
View File

@ -55,7 +55,7 @@ public class PrintDeviceInfo extends BaseEntity {
* 付款二维码：域名+storeId
*/
private String payment;
private Boolean isAcquiesce;
private Boolean acquiesce;
/**
* 店铺id

24
fuintBackend/fuint-application/src/main/java/com/fuint/business/printer/mapper/xml/PrintDeviceInfoMapper.xml
View File

@ -18,21 +18,21 @@
<result property="updateTime" column="update_time" jdbcType="TIMESTAMP"/>
<result property="createBy" column="create_by" jdbcType="VARCHAR"/>
<result property="updateBy" column="update_by" jdbcType="VARCHAR"/>
<result property="isAcquiesce" column="is_acquiesce" jdbcType="VARCHAR"/>
<result property="acquiesce" column="acquiesce" jdbcType="VARCHAR"/>
<result property="storeId" column="store_id" jdbcType="INTEGER"/>
</resultMap>
<!--查询单个-->
<select id="queryById" resultMap="PrintDeviceInfoMap">
select
id,machine_code,msign,device_name,user_id,app_key,app_secret,app_public_key,platform_public_key,access_token,payment,create_time,update_time,create_by,update_by,store_id ,is_acquiesce from print_device_info
id,machine_code,msign,device_name,user_id,app_key,app_secret,app_public_key,platform_public_key,access_token,payment,create_time,update_time,create_by,update_by,store_id ,acquiesce from print_device_info
where id = #{id}
</select>
<!--查询指定行数据-->
<select id="queryAllByLimit" resultMap="PrintDeviceInfoMap">
select
id,machine_code,msign,device_name,user_id,app_key,app_secret,app_public_key,platform_public_key,access_token,payment,create_time,update_time,create_by,update_by,store_id,is_acquiesce from print_device_info
id,machine_code,msign,device_name,user_id,app_key,app_secret,app_public_key,platform_public_key,access_token,payment,create_time,update_time,create_by,update_by,store_id,acquiesce from print_device_info
<where>
<if test="printDeviceInfo.id != null">
and id = #{printDeviceInfo.id}
@ -113,14 +113,14 @@
</select>
<select id="getInfoByStoreId" resultType="com.fuint.business.printer.entity.PrintDeviceInfo">
select
id,machine_code,msign,device_name,user_id,app_key,app_secret,app_public_key,platform_public_key,access_token,payment,create_time,update_time,create_by,update_by,store_id ,is_acquiesce from print_device_info
where store_id = #{storeId} and is_acquiesce = true limit 1
id,machine_code,msign,device_name,user_id,app_key,app_secret,app_public_key,platform_public_key,access_token,payment,create_time,update_time,create_by,update_by,store_id ,acquiesce from print_device_info
where store_id = #{storeId} and acquiesce = true limit 1
</select>
<!--新增所有列-->
<insert id="insert" keyProperty="id" useGeneratedKeys="true">
insert into print_device_info(is_acquiesce,machine_code,msign,device_name,user_id,app_key,app_secret,app_public_key,platform_public_key,access_token,payment,create_time,update_time,create_by,update_by,store_id )
values (#{is_acquiesce},#{machineCode},#{msign},#{deviceName},#{userId},
insert into print_device_info(acquiesce,machine_code,msign,device_name,user_id,app_key,app_secret,app_public_key,platform_public_key,access_token,payment,create_time,update_time,create_by,update_by,store_id )
values (#{acquiesce},#{machineCode},#{msign},#{deviceName},#{userId},
#{appKey},#{appSecret},#{appPublicKey},#{platformPublicKey},#{accessToken},#{payment},
#{createTime},#{updateTime},#{createBy},#{updateBy},#{storeId})
</insert>
@ -194,8 +194,8 @@ machine_code = values(machine_code)msign = values(msign)device_name = values(dev
<if test="storeId != null">
store_id = #{storeId},
</if>
<if test="isAcquiesce != null">
is_acquiesce = #{isAcquiesce},
<if test="acquiesce != null">
acquiesce = #{acquiesce},
</if>
</set>
where id = #{id}
@ -205,11 +205,11 @@ machine_code = values(machine_code)msign = values(msign)device_name = values(dev
<delete id="deleteById">
delete from print_device_info where id = #{id}
</delete>
<update id="updateIsAcquiesce">
update print_device_info set is_acquiesce = false where store_id = #{storeId}
<update id="updateacquiesce">
update print_device_info set acquiesce = false where store_id = #{storeId}
</update>
<select id="getIsAcquiesceByStoreId" resultType="java.lang.Integer">
<select id="getacquiesceByStoreId" resultType="java.lang.Integer">
</select>

4
fuintBackend/fuint-application/src/main/java/com/fuint/business/printer/service/impl/PrintDeviceInfoServiceImpl.java
View File

@ -60,7 +60,7 @@ public class PrintDeviceInfoServiceImpl implements PrintDeviceInfoService {
public PrintDeviceInfo insert(PrintDeviceInfo printDeviceInfo) {
AccountInfo nowAccountInfo = TokenUtil.getNowAccountInfo();
printDeviceInfo.setStoreId(nowAccountInfo.getStoreId());
if (printDeviceInfo.getIsAcquiesce()) {
if (printDeviceInfo.getAcquiesce()) {
printDeviceInfoMapper.updateIsAcquiesce(nowAccountInfo.getStoreId());
}
this.printDeviceInfoMapper.insert(printDeviceInfo);
@ -75,7 +75,7 @@ public class PrintDeviceInfoServiceImpl implements PrintDeviceInfoService {
*/
@Override
public PrintDeviceInfo update(PrintDeviceInfo printDeviceInfo) {
if (printDeviceInfo.getIsAcquiesce()) {
if (printDeviceInfo.getAcquiesce()) {
AccountInfo nowAccountInfo = TokenUtil.getNowAccountInfo();
printDeviceInfoMapper.updateIsAcquiesce(nowAccountInfo.getStoreId());
}

21
pos-uni/pagesHome/AddVip/AddCode.vue
View File

@ -47,10 +47,8 @@
// this.actList = ["1", "1", "1", "1", "1", ]
// this.status = "nomore" 底部刷新结束
// this.getStore()
this.getQRCodeInfoByStoreId()
// this.onReady2()
// await this.onReady()
},
onPullDownRefresh() {
console.log("刷新");
@ -66,23 +64,6 @@
headers
},
methods: {
// async getStore() {
// await request({
// url: 'business/storeInformation/store',
// method: 'get',
// params: this.form
// }).then((res) => {
// if (res.code == 200) {
// this.storeId = res.data.id
// } else {
// uni.showToast({
// title: res.data,
// icon: "none"
// })
// }
// })
// },
getQRCodeInfoByStoreId() {
request({
url: 'business/storeInformation/qrCode/createStoreQrCodeByPos',

16
pos-uni/pagesHome/AddVip/AddVip.vue
View File

@ -56,7 +56,7 @@
<u-picker :show="showXingbie" :columns="xingbieList" keyName="name" @cancel="showXingbie = false"
@confirm="chooseXingbie"></u-picker>
<u-datetime-picker :show="showTime" v-model="dataForm.birthday" mode="date" @cancel="showTime = false"
<u-datetime-picker :show="showTime" v-model="birthday" mode="date" @cancel="showTime = false"
@confirm="chooseTime"></u-datetime-picker>
<u-picker :show="showGrade" :columns="gradeList" keyName="name" @cancel="showGrade = false"
@ -81,10 +81,12 @@
data() {
return {
titles: "新增会员",
birthday: null,
showGrade: false,
showXingbie: false,
showTime: false,
gradeList: [],
gradeList: [],
xingbieList: [
[{
id: 1,
@ -176,8 +178,20 @@
chooseTime(e) {
console.log(123123, e)
this.showTime = false
this.dataForm.birthday = this.formatDateToYYMMDDHHMM(new Date(e.value));
},
formatDateToYYMMDDHHMM(date) {
const year = String(date.getFullYear()); // 获取两位数的年份
const month = String(date.getMonth() + 1).padStart(2, '0'); // 获取月份，并确保是两位数
const day = String(date.getDate()).padStart(2, '0'); // 获取日期，并确保是两位数
const hours = String(date.getHours()).padStart(2, '0'); // 获取小时，并确保是两位数
const minutes = String(date.getMinutes()).padStart(2, '0'); // 获取分钟，并确保是两位数
// return `${year}/${month}/${day} ${hours}:${minutes}`;
return `${year}/${month}/${day}`;
},
goback() {
request({
url: 'business/userManager/user',

7
pos-uni/pagesHome/BusinessData/BusinessData.vue
View File

@ -28,7 +28,9 @@
</view>
<view class="">
<view class="hui-">会员充值/笔数</view>
<view class="lan-">￥{{dataForm.userBalance}}/{{dataForm.userBalanceCount}}</view>
<view class="lan-">
￥{{ (Number) (dataForm.userBalance)+(Number)(dataForm.oilBalance) }}/{{(Number)(dataForm.userBalanceCount)+(Number)(dataForm.oilBalanceCount)}}
</view>
</view>
</view>
<view class="b-bs">
@ -36,7 +38,6 @@
<view class="hui-">退款金额/笔数</view>
<view class="lan-">￥{{dataForm.refBalance}}/{{dataForm.refBalanceCount}}</view>
</view>
</view>
</view>
<view class="hm-box">
@ -128,6 +129,8 @@
alipaycount: '0',
userBalanceByAli: '0',
userBalanceCountByali: '0',
oilBalance: '0',
oilBalanceCount: '0',
},
form: {

20
pos-uni/pagesHome/changeShifts/changeShifts.vue
View File

@ -43,11 +43,14 @@
</view>
</view>
<view style="width: 100%; height: 78px; "></view>
<view class="bottom-d" @click="shift">
<view class="bottom-d" @click="showModal = true">
<view class="anniu">
交班
</view>
</view>
<u-modal :show="showModal" showCancelButton content='是否确定交班' @confirm="shift()"
@cancel="showModal = false"></u-modal>
<u-loading-page :loading="showLoading"></u-loading-page>
</view>
</view>
@ -62,6 +65,8 @@
data() {
return {
titles: "交接班",
showModal: false,
showLoading: false,
handoverList: "",
indexData: {
totalPayMoney: '0',
@ -134,6 +139,8 @@
},
// 获取销售数据
shift() {
this.showModal = false
this.showLoading = true
let recordData = this.handoverList
let handoverRecord = {
@ -141,7 +148,6 @@
recordData: JSON.stringify(recordData),
type: 0,
status: this.handoverList.baseInfo.handoverType,
staffId: this.staff.staffId
}
request({
url: 'business/handoverRecord/addByPos',
@ -150,12 +156,22 @@
}).then((res) => {
if (res.code == 200) {
this.indexData = res.data
this.handoverByPos()
this.showLoading = false
// 交班成功
uni.showToast({
title: "交班成功！",
icon: "none"
})
} else {
uni.showToast({
title: res.data,
icon: "none"
})
}
this.showLoading = false
})
}
}