diff --git a/fuintAdmin/src/views/member/index.vue b/fuintAdmin/src/views/member/index.vue index 6937d3ba4..9ef43d75c 100644 --- a/fuintAdmin/src/views/member/index.vue +++ b/fuintAdmin/src/views/member/index.vue @@ -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' } ], } }; diff --git a/fuintAdmin/src/views/setting/print/index.vue b/fuintAdmin/src/views/setting/print/index.vue index 79a4fa172..bbd09d4bf 100644 --- a/fuintAdmin/src/views/setting/print/index.vue +++ b/fuintAdmin/src/views/setting/print/index.vue @@ -114,7 +114,7 @@ @@ -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 } }, } diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardFule/service/impl/CardFuelRecordServiceImpl.java b/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardFule/service/impl/CardFuelRecordServiceImpl.java index bc035309f..78fa5bba3 100644 --- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardFule/service/impl/CardFuelRecordServiceImpl.java +++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardFule/service/impl/CardFuelRecordServiceImpl.java @@ -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; diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardValueOrders/service/CardValueOrdersService.java b/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardValueOrders/service/CardValueOrdersService.java index d83b5ce45..14a91b5d4 100644 --- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardValueOrders/service/CardValueOrdersService.java +++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardValueOrders/service/CardValueOrdersService.java @@ -35,5 +35,6 @@ public interface CardValueOrdersService extends IService { void updateOrderStatus(String orderNo,String status); void updateBalance(String orderNo,String status); + void updateBalances(String orderNo,String status); } diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardValueOrders/service/impl/CardValueOrdersServiceImpl.java b/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardValueOrders/service/impl/CardValueOrdersServiceImpl.java index d20d1110a..802aa5330 100644 --- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardValueOrders/service/impl/CardValueOrdersServiceImpl.java +++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardValueOrders/service/impl/CardValueOrdersServiceImpl.java @@ -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 { AllOrderInfoVo getIndexData4Pos(@Param("allOrderInfo") AllOrderInfoDto allOrderInfo); AllOrderInfoVo getHandOverList(HandoverRecord record); + + AllOrderInfoVo getOneByOrderNo(String orderNo); } diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/mapper/xml/AllOrderInfoMapper.xml b/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/mapper/xml/AllOrderInfoMapper.xml index 0267154f2..b8c939e7b 100644 --- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/mapper/xml/AllOrderInfoMapper.xml +++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/mapper/xml/AllOrderInfoMapper.xml @@ -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() + + @@ -411,4 +418,4 @@ - \ No newline at end of file + diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/service/AllOrderInfoService.java b/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/service/AllOrderInfoService.java index 55da5abb4..fd65af3b1 100644 --- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/service/AllOrderInfoService.java +++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/service/AllOrderInfoService.java @@ -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); } diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/service/impl/AllOrderInfoServiceImpl.java b/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/service/impl/AllOrderInfoServiceImpl.java index 72fe7a028..8c14dcccc 100644 --- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/service/impl/AllOrderInfoServiceImpl.java +++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/service/impl/AllOrderInfoServiceImpl.java @@ -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 i res.put("error", "储值卡余额不足！"); } } + res.put("orderNo", orderNo); return res; } @@ -1410,7 +1411,7 @@ public class OilOrderServiceImpl extends ServiceImpl 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 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; diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/printer/entity/PrintDeviceInfo.java b/fuintBackend/fuint-application/src/main/java/com/fuint/business/printer/entity/PrintDeviceInfo.java index ee8c684ea..0e922b087 100644 --- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/printer/entity/PrintDeviceInfo.java +++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/printer/entity/PrintDeviceInfo.java @@ -55,7 +55,7 @@ public class PrintDeviceInfo extends BaseEntity { * 付款二维码：域名+storeId */ private String payment; - private Boolean isAcquiesce; + private Boolean acquiesce; /** * 店铺id diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/printer/mapper/xml/PrintDeviceInfoMapper.xml b/fuintBackend/fuint-application/src/main/java/com/fuint/business/printer/mapper/xml/PrintDeviceInfoMapper.xml index 00673b47e..1a0925aed 100644 --- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/printer/mapper/xml/PrintDeviceInfoMapper.xml +++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/printer/mapper/xml/PrintDeviceInfoMapper.xml @@ -18,21 +18,21 @@ - + - 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}) @@ -194,8 +194,8 @@ machine_code = values(machine_code)msign = values(msign)device_name = values(dev store_id = #{storeId}, - - is_acquiesce = #{isAcquiesce}, + + acquiesce = #{acquiesce}, where id = #{id} @@ -205,11 +205,11 @@ machine_code = values(machine_code)msign = values(msign)device_name = values(dev delete from print_device_info where id = #{id} - - update print_device_info set is_acquiesce = false where store_id = #{storeId} + + update print_device_info set acquiesce = false where store_id = #{storeId} - diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/printer/service/impl/PrintDeviceInfoServiceImpl.java b/fuintBackend/fuint-application/src/main/java/com/fuint/business/printer/service/impl/PrintDeviceInfoServiceImpl.java index 7785f2af8..eeb2cb170 100644 --- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/printer/service/impl/PrintDeviceInfoServiceImpl.java +++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/printer/service/impl/PrintDeviceInfoServiceImpl.java @@ -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()); } diff --git a/pos-uni/pagesHome/AddVip/AddCode.vue b/pos-uni/pagesHome/AddVip/AddCode.vue index 21dfc46cf..7be845897 100644 --- a/pos-uni/pagesHome/AddVip/AddCode.vue +++ b/pos-uni/pagesHome/AddVip/AddCode.vue @@ -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', diff --git a/pos-uni/pagesHome/AddVip/AddVip.vue b/pos-uni/pagesHome/AddVip/AddVip.vue index 0158fcc19..3d17c77e2 100644 --- a/pos-uni/pagesHome/AddVip/AddVip.vue +++ b/pos-uni/pagesHome/AddVip/AddVip.vue @@ -56,7 +56,7 @@ - 会员充值/笔数 - ￥{{dataForm.userBalance}}/{{dataForm.userBalanceCount}} + + ￥{{ (Number) (dataForm.userBalance)+(Number)(dataForm.oilBalance) }}/{{(Number)(dataForm.userBalanceCount)+(Number)(dataForm.oilBalanceCount)}} + @@ -36,7 +38,6 @@ 退款金额/笔数 ￥{{dataForm.refBalance}}/{{dataForm.refBalanceCount}} - @@ -128,6 +129,8 @@ alipaycount: '0', userBalanceByAli: '0', userBalanceCountByali: '0', + oilBalance: '0', + oilBalanceCount: '0', }, form: { diff --git a/pos-uni/pagesHome/changeShifts/changeShifts.vue b/pos-uni/pagesHome/changeShifts/changeShifts.vue index 866afbcf5..bec46d282 100644 --- a/pos-uni/pagesHome/changeShifts/changeShifts.vue +++ b/pos-uni/pagesHome/changeShifts/changeShifts.vue @@ -43,11 +43,14 @@ - + 交班 + + @@ -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 + }) } }