From 70d1a50a04321e4b661bfadd6ea8d29909ef07cc Mon Sep 17 00:00:00 2001 From: cun-nan <19819293608@163.com> Date: Wed, 29 May 2024 11:05:24 +0800 Subject: [PATCH 01/12] bug --- .../api/fuyou/controller/FyPayController.java | 40 ++--- .../com/fuint/api/fuyou/entity/Const.java | 4 +- .../fuyou/service/impl/FyPayServiceImpl.java | 20 +++ .../order/controller/OilOrderController.java | 10 ++ .../order/service/OilOrderService.java | 2 +- .../service/impl/OilOrderServiceImpl.java | 38 ++-- pos-uni/.hbuilderx/launch.json | 39 ++-- pos-uni/pages/index/index.vue | 2 +- pos-uni/pagesHome/Collection/Collection.vue | 19 +- pos-uni/pagesHome/PaymentCode/PaymentCode.vue | 13 +- pos-uni/pagesHome/PaymentCode/SetUpCode.vue | 170 +++++++++++++++++- .../PaymentResults/PaymentResults.vue | 42 ++++- pos-uni/static/imgs/zfsb.png | Bin 0 -> 6982 bytes 13 files changed, 325 insertions(+), 74 deletions(-) create mode 100644 pos-uni/static/imgs/zfsb.png diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/api/fuyou/controller/FyPayController.java b/fuintBackend/fuint-application/src/main/java/com/fuint/api/fuyou/controller/FyPayController.java index 0dea7e961..03990cce7 100644 --- a/fuintBackend/fuint-application/src/main/java/com/fuint/api/fuyou/controller/FyPayController.java +++ b/fuintBackend/fuint-application/src/main/java/com/fuint/api/fuyou/controller/FyPayController.java @@ -140,26 +140,26 @@ public class FyPayController { String orderLock = "orderLock_notify"+orderNo; if (redisLock.tryLock(orderLock,5000, TimeUnit.MILLISECONDS)){ // 业务逻辑 判断订单状态 -// AllOrderInfo allOrderInfo = allOrderInfoService.selectAllOrderInfoByOrderNo(orderNo); -// if (ObjectUtil.isNotEmpty(allOrderInfo)){ -// allOrderInfo.setPayMoney(Double.valueOf(settleOrderAmt)/100); -// allOrderInfo.setTransactionId(transactionId); -// allOrderInfo.setStatus("paid"); -// allOrderInfo.setPayTime(new Date()); -// allOrderInfoService.updateAllOrderInfo(allOrderInfo); -// -// // 修改配置收款账户余额信息 -// MerchantConfig merchantConfig = merchantConfigService.selectMeChByIdIsUse(allOrderInfo.getStoreId()); -// Double beforeAmount = merchantConfig.getAmount(); -// Double afterAmount = beforeAmount + allOrderInfo.getPayMoney(); -// merchantConfig.setAmount(afterAmount); -// merchantConfigService.updateMerch(merchantConfig); -// merchantConfigRecordService.updateMerchantConfigRecordByOrderNo(orderNo,"yes"); -// } -// -// updateOrderStatus(orderNo,allOrderInfo.getType()); -//// 修改订单支付状态 -// redisLock.unlock(orderLock); + AllOrderInfo allOrderInfo = allOrderInfoService.selectAllOrderInfoByOrderNo(orderNo); + if (ObjectUtil.isNotEmpty(allOrderInfo)){ + allOrderInfo.setPayMoney(Double.valueOf(settleOrderAmt)/100); + allOrderInfo.setTransactionId(transactionId); + allOrderInfo.setStatus("paid"); + allOrderInfo.setPayTime(new Date()); + allOrderInfoService.updateAllOrderInfo(allOrderInfo); + + // 修改配置收款账户余额信息 + MerchantConfig merchantConfig = merchantConfigService.selectMeChByIdIsUse(allOrderInfo.getStoreId()); + Double beforeAmount = merchantConfig.getAmount(); + Double afterAmount = beforeAmount + allOrderInfo.getPayMoney(); + merchantConfig.setAmount(afterAmount); + merchantConfigService.updateMerch(merchantConfig); + merchantConfigRecordService.updateMerchantConfigRecordByOrderNo(orderNo,"yes"); + } + + updateOrderStatus(orderNo,allOrderInfo.getType()); +// 修改订单支付状态 + redisLock.unlock(orderLock); } // transaction_id 加锁 return "1"; diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/api/fuyou/entity/Const.java b/fuintBackend/fuint-application/src/main/java/com/fuint/api/fuyou/entity/Const.java index c7ffc92c4..956fba457 100644 --- a/fuintBackend/fuint-application/src/main/java/com/fuint/api/fuyou/entity/Const.java +++ b/fuintBackend/fuint-application/src/main/java/com/fuint/api/fuyou/entity/Const.java @@ -50,8 +50,8 @@ public class Const { //小程序异步通知(回调地址) // public static String notify_url = "https://www.tuofeng.cc/oilAdmin/api/fyPay/notify"; - public static String notify_url = "http://k40180f897.goho.co/api/fyPay/notify"; -// public static String notify_url = "https://8q4f124343.yicp.fun/api/fyPay/notify"; +// public static String notify_url = "http://k40180f897.goho.co/api/fyPay/notify"; + public static String notify_url = "https://8q4f124343.yicp.fun/api/fyPay/notify"; //主扫异步通知(回调地址) // public static String notify_url_scan = "https://www.tuofeng.cc/oilAdmin/api/fyPay/notifyScan"; diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/api/fuyou/service/impl/FyPayServiceImpl.java b/fuintBackend/fuint-application/src/main/java/com/fuint/api/fuyou/service/impl/FyPayServiceImpl.java index e8a61a940..a41f78e3a 100644 --- a/fuintBackend/fuint-application/src/main/java/com/fuint/api/fuyou/service/impl/FyPayServiceImpl.java +++ b/fuintBackend/fuint-application/src/main/java/com/fuint/api/fuyou/service/impl/FyPayServiceImpl.java @@ -824,6 +824,7 @@ public class FyPayServiceImpl implements FyPayService { map.put("random_str", "orderNo"); map.put("order_type", receiveParameterPos.getPayType()); map.put("goods_des", receiveParameterPos.getContent()); + map.put("goods_detail", receiveParameterPos.getContent()); double amount = receiveParameterPos.getGoodsMoney() * 100; map.put("order_amt", String.valueOf((int) amount)); String nowtime = DateUtil.format(new Date(), "yyyyMMddHHmmss"); @@ -834,6 +835,18 @@ public class FyPayServiceImpl implements FyPayService { Const.INS_PUBLIC_KEY = publicKey; Const.INS_PRIVATE_KEY = privateKey; + if (ObjectUtil.isNotEmpty(merchantConfig)) { + +// 添加配置记录信息 + MerchantConfigRecord merchantConfigRecord = new MerchantConfigRecord(); + merchantConfigRecord.setMerchantId(merchantConfig.getId()); + merchantConfigRecord.setIsSuccess("no"); + merchantConfigRecord.setAmount(receiveParameterPos.getGoodsMoney()); + merchantConfigRecord.setType("0"); + merchantConfigRecord.setStoreId(merchantConfig.getStoreId()); + merchantConfigRecord.setOrderNo(receiveParameterPos.getOrderNo()); + merchantConfigRecordService.insertMerchantConfigRecord(merchantConfigRecord); + } // 请求报文 String reqBody = Message.requestMsg(map); // 响应报文 @@ -844,6 +857,13 @@ public class FyPayServiceImpl implements FyPayService { String str = resMap.get("sign"); if (Utils.verifySign(resMap, str)) { + OilOrder oilOrder = oilOrderService.selectOilOrderByOrderNo(receiveParameterPos.getOrderNo()); + ReceiveParameter receiveParameter = new ReceiveParameter(); + BeanUtils.copyProperties(receiveParameterPos, receiveParameter); +// 添加订单信息 + Double discountAmount = 0.0; + if (ObjectUtil.isNotEmpty(oilOrder)) discountAmount = oilOrder.getDiscountAmount(); + this.insertAllOrderInfo(receiveParameter, discountAmount); System.out.println(resMap); } return resMap; diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/controller/OilOrderController.java b/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/controller/OilOrderController.java index e6c32d533..3e923c8cc 100644 --- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/controller/OilOrderController.java +++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/controller/OilOrderController.java @@ -342,4 +342,14 @@ public class OilOrderController extends BaseController { public ResponseObject addOrderPos(@RequestBody OilOrderVo oilOrderVo) throws Exception { return getSuccessResult(orderService.addOrderPos(oilOrderVo)); } + + /** + * pos端扫码支付 + * @param oilOrderVo + * @return + */ + @PostMapping("addOrderScanPos") + public ResponseObject addOrderScanPos(@RequestBody OilOrderVo oilOrderVo) throws Exception { + return getSuccessResult(orderService.addOrderPosScan(oilOrderVo)); + } } diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/service/OilOrderService.java b/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/service/OilOrderService.java index e9dc2bb71..a0539531b 100644 --- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/service/OilOrderService.java +++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/service/OilOrderService.java @@ -222,5 +222,5 @@ public interface OilOrderService extends IService { * @param oilOrderVo * @return */ - Map addOrderPosScan(OilOrderVo oilOrderVo) throws Exception; + Map addOrderPosScan(OilOrderVo oilOrderVo) throws Exception; } diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/service/impl/OilOrderServiceImpl.java b/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/service/impl/OilOrderServiceImpl.java index 12430e5b7..3fd0c4820 100644 --- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/service/impl/OilOrderServiceImpl.java +++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/service/impl/OilOrderServiceImpl.java @@ -1727,7 +1727,8 @@ public class OilOrderServiceImpl extends ServiceImpl i int row = 0; OilOrder oilOrder = this.selectOilOrderByOrderNo(orderNo); Integer userId = oilOrder.getUserId(); - LJUser user = userService.queryUserByUserId(userId); + LJUser user = null; + if (ObjectUtil.isNotEmpty(userId)) user = userService.queryUserByUserId(userId); if (ObjectUtil.isNotEmpty(oilOrder)) { // oilOrder.setPayAmount(oilOrder.getOrderAmount()-oilOrder.getDiscountAmount()); oilOrder.setOrderStatus(status); @@ -1781,14 +1782,16 @@ public class OilOrderServiceImpl extends ServiceImpl i cardValueChildOrder.setPayTime(new Date()); cardValueChildOrderService.updateCardValueChildOrder(cardValueChildOrder); + if (ObjectUtil.isNotEmpty(user)) { // 查询主卡信息 - CardValudChildrens cardValudChildrens = cardValudChildrensService.selectCardValueChildrenByMobileAndStoreId(user.getMobile(), oilOrder.getStoreId()); - userId = cardValudChildrens.getUserId(); + CardValudChildrens cardValudChildrens = cardValudChildrensService.selectCardValueChildrenByMobileAndStoreId(user.getMobile(), oilOrder.getStoreId()); + userId = cardValudChildrens.getUserId(); + } } - this.updateGrowthValue(oilOrder.getOrderAmount(), oilOrder.getPayAmount(), userId, Integer.valueOf(oilOrder.getOils()), null, oilOrder.getStoreId(), orderNo); + if (ObjectUtil.isNotEmpty(userId)) this.updateGrowthValue(oilOrder.getOrderAmount(), oilOrder.getPayAmount(), userId, Integer.valueOf(oilOrder.getOils()), null, oilOrder.getStoreId(), orderNo); this.addOilTracks(oilOrder, oilOrder.getStoreId()); this.updateCardAndActiveById(oilOrder.getStoreId(), oilOrder.getUserId(), oilOrder.getActiveId(), oilOrder.getCouponId(), oilOrder.getActiveType(), oilOrder.getOrderAmount(), oilOrder.getPayAmount(), Integer.valueOf(oilOrder.getOils())); - this.insertCardBalance(oilOrder.getOrderAmount() - oilOrder.getDiscountAmount() - oilOrder.getPayAmount(), userId, oilOrder.getStoreId(), orderNo); + if (ObjectUtil.isNotEmpty(userId)) this.insertCardBalance(oilOrder.getOrderAmount() - oilOrder.getDiscountAmount() - oilOrder.getPayAmount(), userId, oilOrder.getStoreId(), orderNo); if (ObjectUtil.isNotEmpty(oilOrder.getStaffId())) staffCommissionService.countStaffCommission(oilOrder.getStaffId(), oilOrder.getStoreId(), oilOrder.getOrderAmount(), oilOrder.getPayAmount(), "1", orderNo); } @@ -2385,7 +2388,7 @@ public class OilOrderServiceImpl extends ServiceImpl i this.addOilTracks(oilOrderVo, nowAccountInfo.getStoreId()); this.updateCardAndActiveById(nowAccountInfo.getStoreId(), oilOrderVo.getUserId(), oilOrderVo.getActiveId(), oilOrderVo.getCouponId(), oilOrderVo.getActiveType(), oilOrderVo.getOrderAmount(), oilOrderVo.getPayAmount(), Integer.valueOf(oilOrderVo.getOils())); this.insertAllOrderInfo(orderNo, nowAccountInfo.getStoreId(), oilOrderVo.getOrderAmount(), oilOrderVo.getPayAmount(), oilOrderVo.getDiscountAmount(), oilOrderVo.getPayType(), oilOrderVo.getUserId(), "POS", "1", "paid"); - this.insertFavorable(oilOrderVo, oilOrderVo.getOilCardAmount()); + this.insertFavorable(oilOrderVo, oilOrderVo.getOilCardAmount1()); if (ObjectUtil.isNotEmpty(oilOrderVo.getUserId())) integralSettingsService.refuelPoints(oilOrderVo); //修改优惠券使用状态 if (oilOrderVo.getCouponId() != null) { @@ -2406,8 +2409,8 @@ public class OilOrderServiceImpl extends ServiceImpl i } @Override - public Map addOrderPosScan(OilOrderVo oilOrderVo) throws Exception { - Map res = new HashMap<>(); + public Map addOrderPosScan(OilOrderVo oilOrderVo) throws Exception { + Map res = new HashMap<>(); AccountInfo nowAccountInfo = TokenUtil.getNowAccountInfo(); // 根据日期生成订单信息 SimpleDateFormat dateFormat = new SimpleDateFormat("yyyyMMddHHmmss"); @@ -2415,23 +2418,34 @@ public class OilOrderServiceImpl extends ServiceImpl i String randomString = UUID.randomUUID().toString().replace("-", "").substring(0, 6); String orderNo = "2345" + timestamp + randomString; - oilOrderVo.setOrderNo(orderNo); oilOrderVo.setStoreId(nowAccountInfo.getStoreId()); oilOrderVo.setStaffId(nowAccountInfo.getStaffId()); oilOrderVo.setTerminal("POS"); oilOrderVo.setOrderStatus("unpaid"); oilOrderVo.setOrderType("主订单"); - int row = baseMapper.insert(oilOrderVo); + if (ObjectUtil.isNotEmpty(oilOrderVo.getOrderNo())){ + OilOrder oilOrder = this.selectOilOrderByOrderNo(oilOrderVo.getOrderNo()); + oilOrderVo.setId(oilOrder.getId()); + oilOrderVo.setOrderNo(orderNo); + baseMapper.updateById(oilOrderVo); + }else { + oilOrderVo.setOrderNo(orderNo); + baseMapper.insert(oilOrderVo); + } + ReceiveParameterPos receiveParameterPos = new ReceiveParameterPos(); +// receiveParameterPos.setPayType("WECHAT"); receiveParameterPos.setPayType(oilOrderVo.getPayType()); receiveParameterPos.setType("1"); receiveParameterPos.setContent("油品订单"); receiveParameterPos.setOrderNo(orderNo); receiveParameterPos.setStoreId(oilOrderVo.getStoreId()); - receiveParameterPos.setStoreId(oilOrderVo.getUserId()); + receiveParameterPos.setUserId(oilOrderVo.getUserId()); receiveParameterPos.setGoodsMoney(oilOrderVo.getPayAmount()); receiveParameterPos.setOilCardAmount(oilOrderVo.getOilCardAmount1()); Map mainScan = fyPayService.mainScan(receiveParameterPos); - return mainScan; + res.put("oilOrder",this.selectOilOrderByOrderNo(orderNo)); + res.put("scanCode",mainScan); + return res; } } diff --git a/pos-uni/.hbuilderx/launch.json b/pos-uni/.hbuilderx/launch.json index ee5be7746..07d928111 100644 --- a/pos-uni/.hbuilderx/launch.json +++ b/pos-uni/.hbuilderx/launch.json @@ -1,20 +1,23 @@ -{ // launch.json 配置了启动调试时相关设置，configurations下节点名称可为 app-plus/h5/mp-weixin/mp-baidu/mp-alipay/mp-qq/mp-toutiao/mp-360/ - // launchtype项可配置值为local或remote, local代表前端连本地云函数，remote代表前端连云端云函数 - "version": "0.0", - "configurations": [{ - "app-plus" : - { - "launchtype" : "local" - }, - "default" : - { - "launchtype" : "local" - }, - "mp-weixin" : - { - "launchtype" : "local" - }, - "type" : "uniCloud" - } +{ + // launch.json 配置了启动调试时相关设置，configurations下节点名称可为 app-plus/h5/mp-weixin/mp-baidu/mp-alipay/mp-qq/mp-toutiao/mp-360/ + // launchtype项可配置值为local或remote, local代表前端连本地云函数，remote代表前端连云端云函数 + "version" : "0.0", + "configurations" : [ + { + "app-plus" : { + "launchtype" : "local" + }, + "default" : { + "launchtype" : "local" + }, + "mp-weixin" : { + "launchtype" : "local" + }, + "type" : "uniCloud" + }, + { + "playground" : "standard", + "type" : "uni-app:app-android" + } ] } diff --git a/pos-uni/pages/index/index.vue b/pos-uni/pages/index/index.vue index 5fa2ebbb9..1a4b8d4dd 100644 --- a/pos-uni/pages/index/index.vue +++ b/pos-uni/pages/index/index.vue @@ -117,7 +117,7 @@ }, goCode() { uni.navigateTo({ - url: '/pagesHome/PaymentCode/PaymentCode' + url: '/pagesHome/PaymentCode/SetUpCode' }) }, gochangeShifts() { diff --git a/pos-uni/pagesHome/Collection/Collection.vue b/pos-uni/pagesHome/Collection/Collection.vue index e85f93dab..2e5b076db 100644 --- a/pos-uni/pagesHome/Collection/Collection.vue +++ b/pos-uni/pagesHome/Collection/Collection.vue @@ -39,7 +39,6 @@ :key="index" @click="getspearIndex(index,item)"> {{item.gunName}} - @@ -85,8 +84,8 @@ - 确定 - 取消 + 确定 + 取消 @@ -228,6 +227,11 @@ headers }, methods: { + // 确定备注 + submitRemark(){ + this.show = false + this.oilOrder.remark = this.value1 + }, close() { this.show = false }, @@ -446,9 +450,12 @@ this.oilOrder.tankId = this.tankId this.oilOrder.oilPrice = this.oilPrice this.oilOrder.oilCardAmount1 = this.oilCardAmount - this.oilOrder.userId = this.userInfo.id this.oilOrder.oilGunNum = this.oilGunNum - this.oilOrder.payUser = this.userInfo.mobile + if (this.userInfo){ + this.oilOrder.userId = this.userInfo.id + this.oilOrder.payUser = this.userInfo.mobile + } + request({ url: "business/oilOrder/addOrderPos", method: 'post', @@ -463,7 +470,7 @@ // }) uni.navigateTo({ - url: "/pagesHome/PaymentResults/PaymentResults" + url: "/pagesHome/PaymentResults/PaymentResults?orderNo="+this.orderNo }) } else if (res.data.code == 2) { uni.showToast({ diff --git a/pos-uni/pagesHome/PaymentCode/PaymentCode.vue b/pos-uni/pagesHome/PaymentCode/PaymentCode.vue index f1601dda1..a3bc1afe5 100644 --- a/pos-uni/pagesHome/PaymentCode/PaymentCode.vue +++ b/pos-uni/pagesHome/PaymentCode/PaymentCode.vue @@ -22,11 +22,16 @@ data() { return { titles: "刷卡支付", - + orderNo:"", + qrCode:"", } }, - onLoad() { + onLoad(e) { + this.orderNo = e.orderNo + this.qrCode = uni.getStorageSync("qrCode") + console.log(this.qrCode); this.onReady() + }, onShow() { // this.actList = ["1", "1", "1", "1", "1", ] @@ -49,14 +54,14 @@ // 设置金额 setAmount() { uni.navigateTo({ - url: "/pagesHome/PaymentCode/SetUpCode" + url: "/pagesHome/PaymentCode/SetUpCode?orderNo="+this.orderNo }) }, onReady() { // 获取uQRCode实例 var qr = new UQRCode(); // 设置二维码内容 - qr.data = "https://uqrcode.cn/doc"; + qr.data = this.qrCode; // 设置二维码大小，必须与canvas设置的宽高一致 qr.size = 200; // 调用制作二维码方法 diff --git a/pos-uni/pagesHome/PaymentCode/SetUpCode.vue b/pos-uni/pagesHome/PaymentCode/SetUpCode.vue index 2d79c155d..f6dea918a 100644 --- a/pos-uni/pagesHome/PaymentCode/SetUpCode.vue +++ b/pos-uni/pagesHome/PaymentCode/SetUpCode.vue @@ -4,30 +4,73 @@ 金额 - + 备注 - + + + + 选择油枪 + + + {{item.gunName}} + + + + 选择支付方式 + + + {{item.dictLabel}} + + + + + + + 确定 + - - - \ No newline at end of file From 96fe1682b267299fc5982933d470424328902f7f Mon Sep 17 00:00:00 2001 From: cun-nan <19819293608@163.com> Date: Wed, 29 May 2024 13:53:49 +0800 Subject: [PATCH 04/12] bug --- pos-uni/pagesHome/CardPayment/CardPayment.vue | 1 + 1 file changed, 1 insertion(+) diff --git a/pos-uni/pagesHome/CardPayment/CardPayment.vue b/pos-uni/pagesHome/CardPayment/CardPayment.vue index e25d745fe..bbec78a31 100644 --- a/pos-uni/pagesHome/CardPayment/CardPayment.vue +++ b/pos-uni/pagesHome/CardPayment/CardPayment.vue @@ -7,6 +7,7 @@ 请将您的卡片插入POS机 + From 5394e4969bd8569285cd4cfdfd19231cd1a28847 Mon Sep 17 00:00:00 2001 From: xvv Date: Wed, 29 May 2024 14:07:07 +0800 Subject: [PATCH 05/12] =?UTF-8?q?pos=20=E7=AB=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../MemberRecharge/MemberRecharge.vue | 49 +++++++++++++++---- 1 file changed, 39 insertions(+), 10 deletions(-) diff --git a/pos-uni/pagesHome/MemberRecharge/MemberRecharge.vue b/pos-uni/pagesHome/MemberRecharge/MemberRecharge.vue index 5994e9eeb..4309839da 100644 --- a/pos-uni/pagesHome/MemberRecharge/MemberRecharge.vue +++ b/pos-uni/pagesHome/MemberRecharge/MemberRecharge.vue @@ -56,7 +56,10 @@ 微信扫码支付 - + + + + @@ -66,7 +69,10 @@ 支付宝扫码支付 - + + + + @@ -76,7 +82,10 @@ 银联扫码支付 - + + + + @@ -86,7 +95,10 @@ 现金支付 - + + + + @@ -107,6 +119,7 @@ return { titles: "会员充值", listindex: 0, + memberId: 0, numList: [ "50元", "100元", @@ -115,14 +128,14 @@ "1000元", "自定义金额", ], - isChooseUser:false, - userId:"", - userInfo:"", + isChooseUser: false, + userId: "", + userInfo: "", } }, onLoad(e) { this.userId = e.userId - if (e.userId){ + if (e.userId) { this.isChooseUser = true this.getUser() } @@ -145,6 +158,10 @@ headers }, methods: { + getmemberId(num) { + this.memberId = num + console.log(this.memberId); + }, // 获取用户信息 getUser() { request({ @@ -154,9 +171,9 @@ this.userInfo = res.data }) }, - goChooseUser(){ + goChooseUser() { uni.navigateTo({ - url:"/pagesHome/searchVip/searchVip?type=1" + url: "/pagesHome/searchVip/searchVip?type=1" }) }, getindex(index) { @@ -377,4 +394,16 @@ border-radius: 50%; border: 1px solid #333333; } + + .qiux { + width: 16px; + height: 16px; + border-radius: 50%; + border: 1px solid #0864e9; + background: #0864e9; + display: flex; + align-items: center; + justify-content: center; + color: #fff; + } \ No newline at end of file From 5511d2c00a9a79abeedaf46ee2f4b73260ee3837 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=BD=90=E5=A4=A9=E5=A4=A7=E5=9C=A3?= <17615834396@163.com> Date: Wed, 29 May 2024 15:00:12 +0800 Subject: [PATCH 06/12] =?UTF-8?q?=E6=B6=88=E6=81=AF=E9=80=9A=E7=9F=A5?= =?UTF-8?q?=E5=8E=BB=E9=99=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pos-uni/pages/index/index.vue | 4 ++-- pos-uni/pages/my/my.vue | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/pos-uni/pages/index/index.vue b/pos-uni/pages/index/index.vue index 5fa2ebbb9..ed840bb85 100644 --- a/pos-uni/pages/index/index.vue +++ b/pos-uni/pages/index/index.vue @@ -62,10 +62,10 @@ - + diff --git a/pos-uni/pages/my/my.vue b/pos-uni/pages/my/my.vue index 79cdbee96..48f7d0c24 100644 --- a/pos-uni/pages/my/my.vue +++ b/pos-uni/pages/my/my.vue @@ -17,10 +17,10 @@ - + 服务条款 From 3ab8bb27d5291d4346783af39ffc285571038274 Mon Sep 17 00:00:00 2001 From: "DESKTOP-369JRHT\\12997" <9> Date: Wed, 29 May 2024 15:15:33 +0800 Subject: [PATCH 07/12] no message --- .../controller/HandoverRecordController.java | 7 + .../business/order/entity/HandoverRecord.java | 1 + .../order/mapper/xml/AllOrderInfoMapper.xml | 39 ++- .../service/impl/AllOrderInfoServiceImpl.java | 12 +- .../impl/HandoverRecordServiceImpl.java | 15 +- .../business/order/vo/AllOrderInfoVo.java | 6 + .../printer/controller/printerController.java | 13 + .../com/fuint/repository/model/MtUser.java | 3 +- fuintBackend/lib/M1AIDL.jar | Bin 0 -> 3400 bytes fuintBackend/lib/PrintAIDL.jar | Bin 0 -> 11422 bytes pos-uni/components/header/headers.vue | 15 +- pos-uni/pages.json | 21 ++ pos-uni/pages/my/my.vue | 23 +- pos-uni/pagesHome/AddVip/AddCode.vue | 5 +- .../pagesHome/BusinessData/BusinessData.vue | 42 ++- .../pagesHome/changeShifts/changeShifts.vue | 28 +- pos-uni/pagesHome/changeShifts/list.vue | 68 ++++- pos-uni/pagesHome/orderList/orderList.vue | 201 +++++++++++++- pos-uni/pagesHome/outher/my.vue | 247 ++++++++++++++++++ pos-uni/pagesHome/outher/serviceList.vue | 245 +++++++++++++++++ pos-uni/pagesHome/outher/yinsi.vue | 247 ++++++++++++++++++ 21 files changed, 1189 insertions(+), 49 deletions(-) create mode 100644 fuintBackend/lib/M1AIDL.jar create mode 100644 fuintBackend/lib/PrintAIDL.jar create mode 100644 pos-uni/pagesHome/outher/my.vue create mode 100644 pos-uni/pagesHome/outher/serviceList.vue create mode 100644 pos-uni/pagesHome/outher/yinsi.vue diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/controller/HandoverRecordController.java b/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/controller/HandoverRecordController.java index 796cdffe5..3409281fa 100644 --- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/controller/HandoverRecordController.java +++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/controller/HandoverRecordController.java @@ -81,6 +81,13 @@ public class HandoverRecordController extends BaseController { return getSuccessResult(this.handoverRecordService.insert(handoverRecord)); } + @PostMapping("addByPos") + public ResponseObject addByPos(@RequestBody HandoverRecord handoverRecord) { + AccountInfo nowAccountInfo = TokenUtil.getNowAccountInfo(); + handoverRecord.setStaffId(nowAccountInfo.getStaffId()); + return getSuccessResult(this.handoverRecordService.insert(handoverRecord)); + } + /** * 编辑数据 * diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/entity/HandoverRecord.java b/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/entity/HandoverRecord.java index e7dccae09..6a26e25c5 100644 --- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/entity/HandoverRecord.java +++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/entity/HandoverRecord.java @@ -28,6 +28,7 @@ public class HandoverRecord extends BaseEntity { * 交班数据记录 */ private String recordData; + @TableField(exist = false) private String totalPayMoney; private String staffName; 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 a5a1aeb30..a7ccd772a 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 @@ -319,7 +319,16 @@ SUM(CASE WHEN aoi.content = '储值卡订单' THEN pay_money ELSE 0 END) AS userBalance, COUNT(CASE WHEN aoi.content = '储值卡订单' THEN 0 END) AS userBalanceCount, SUM(CASE WHEN aoi.content = '油品充值' THEN pay_money ELSE 0 END) AS oilBalance, - COUNT(CASE WHEN aoi.content = '油品充值' THEN 0 END) AS oilBalanceCount + 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 + + + + from all_order_info aoi left join mt_user mu ON aoi.user_id = mu.id @@ -376,21 +385,29 @@ all_order_info staff_id = #{staffId} - - AND start_time >= #{startTime} -- 开始时间检索 - - - AND end_time <= #{endTime} -- 结束时间检索 - + + and date_format(pay_time,'%y%m%d') >= date_format(#{startTime},'%y%m%d') + + + and date_format(pay_time,'%y%m%d') <= date_format(#{endTime},'%y%m%d') + - - + + - - + + + + + + + + + + \ No newline at end of file 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 3ba032ef2..efeced973 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 @@ -100,6 +100,11 @@ public class AllOrderInfoServiceImpl extends ServiceImpl longs = new ArrayList<>(); + longs.add(l); + allOrderInfo.setStoreIds(longs); +// AllOrderInfoVo tradingData = allOrderInfoMapper.getTradingData(allOrderInfo); return allOrderInfoMapper.getTradingData(allOrderInfo); } diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/service/impl/HandoverRecordServiceImpl.java b/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/service/impl/HandoverRecordServiceImpl.java index ae9573b39..055bc4010 100644 --- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/service/impl/HandoverRecordServiceImpl.java +++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/service/impl/HandoverRecordServiceImpl.java @@ -11,6 +11,7 @@ import com.fuint.business.order.mapper.AllOrderInfoMapper; import com.fuint.business.order.mapper.HandoverRecordMapper; import com.fuint.business.order.service.AllOrderInfoService; import com.fuint.business.order.service.HandoverRecordService; +import com.fuint.business.order.vo.AllOrderInfoVo; import com.fuint.business.store.entity.MtStore; import com.fuint.business.store.service.StoreService; import com.fuint.business.userManager.mapper.LJUserMapper; @@ -83,14 +84,14 @@ public class HandoverRecordServiceImpl implements HandoverRecordService { for (HandoverRecord record : handoverRecordIPage.getRecords()) { - DateTime dateTime = DateTime.of(record.getStartTime()); - DateTime dateTime1 = DateTime.of(record.getEndTime()); - record.setEndTime1(dateTime.toString()); - record.setStartTime1(dateTime1.toString()); - allOrderInfoMapper.getHandOverList(record); - record.setTotalPayMoney(record.getTotalPayMoney()); +// DateTime dateTime = DateTime.of(record.getStartTime()); +// DateTime dateTime1 = DateTime.of(record.getEndTime()); +// record.setEndTime1(dateTime.toString()); +// record.setStartTime1(dateTime1.toString()); + AllOrderInfoVo handOverList = allOrderInfoMapper.getHandOverList(record); + record.setTotalPayMoney(handOverList.getTotalPayMoney()); } - return this.handoverRecordMapper.queryAllByLimit(page, handoverRecord); + return handoverRecordIPage; } @Override diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/vo/AllOrderInfoVo.java b/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/vo/AllOrderInfoVo.java index 00dbc84d1..db47b8ef9 100644 --- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/vo/AllOrderInfoVo.java +++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/vo/AllOrderInfoVo.java @@ -24,6 +24,7 @@ public class AllOrderInfoVo extends AllOrderInfo { private String strokesPerDay; private String storeCount ; private String inertiaStore; + private String avatar; @@ -55,6 +56,11 @@ public class AllOrderInfoVo extends AllOrderInfo { private String totalCount; private String totalRefund; + private String userBalanceByWechat; + private String userBalanceCountByWechat; + private String userBalanceByAli; + private String userBalanceCountByali; + diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/printer/controller/printerController.java b/fuintBackend/fuint-application/src/main/java/com/fuint/business/printer/controller/printerController.java index 3aba10ed1..10c16e20d 100644 --- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/printer/controller/printerController.java +++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/printer/controller/printerController.java @@ -303,4 +303,17 @@ public class printerController extends BaseController { printerService.printIntegralReport(integral,TokenUtil.getNowAccountInfo().getStoreId()); } + + @GetMapping("posPrinter") + public void posPrinter() { +// printRegisterReceiver(); +// Intent intent=new Intent(); +// +// new ComponentName(); + } + + + + + } diff --git a/fuintBackend/fuint-repository/src/main/java/com/fuint/repository/model/MtUser.java b/fuintBackend/fuint-repository/src/main/java/com/fuint/repository/model/MtUser.java index 6043c309b..7f2ce6144 100644 --- a/fuintBackend/fuint-repository/src/main/java/com/fuint/repository/model/MtUser.java +++ b/fuintBackend/fuint-repository/src/main/java/com/fuint/repository/model/MtUser.java @@ -51,6 +51,7 @@ public class MtUser implements Serializable { @ApiModelProperty("证件号码") private String idcard; + @TableField(exist = false) @ApiModelProperty("等级ID") private String gradeId; // @@ -81,7 +82,7 @@ public class MtUser implements Serializable { @ApiModelProperty("来源渠道") private String source; - + @TableField(exist = false) @ApiModelProperty("密码") private String password; diff --git a/fuintBackend/lib/M1AIDL.jar b/fuintBackend/lib/M1AIDL.jar new file mode 100644 index 0000000000000000000000000000000000000000..cf8b9cc781fcfb82d2a29af138d963064723df7a GIT binary patch literal 3400 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 V3(*};dH{g#@Y*_TmKxJh_9v-tv~&Of literal 0 HcmV?d00001 diff --git a/fuintBackend/lib/PrintAIDL.jar b/fuintBackend/lib/PrintAIDL.jar new file mode 100644 index 0000000000000000000000000000000000000000..90f147938fda4982b4025e426bc788ddafd09c46 GIT binary patch literal 11422 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 literal 0 HcmV?d00001 diff --git a/pos-uni/components/header/headers.vue b/pos-uni/components/header/headers.vue index 929dbfcea..7805f6d72 100644 --- a/pos-uni/components/header/headers.vue +++ b/pos-uni/components/header/headers.vue @@ -5,7 +5,10 @@ {{titles}} - + + {{type?'筛选':''}} + + @@ -18,7 +21,8 @@ } }, props: { - titles: String + titles: String, + type: String }, mounted() { @@ -26,10 +30,13 @@ methods: { gobock() { uni.navigateBack() + }, + clickChild() { + console.log("2222222222222222222222222") + this.$emit('chiledEvent', 123); } } - } @@ -51,7 +58,7 @@ top: 0px; .my-icons { - width: 20px; + width: 50px; } diff --git a/pos-uni/pages.json b/pos-uni/pages.json index e5b1a0332..4effa8aec 100644 --- a/pos-uni/pages.json +++ b/pos-uni/pages.json @@ -92,6 +92,27 @@ "navigationStyle": "custom" } }, + { + "path": "outher/serviceList", + "style": { + "navigationBarTitleText": "服务条款", + "navigationStyle": "custom" + } + }, + { + "path": "outher/my", + "style": { + "navigationBarTitleText": "关于我们", + "navigationStyle": "custom" + } + }, + { + "path": "outher/yinsi", + "style": { + "navigationBarTitleText": "隐私协议", + "navigationStyle": "custom" + } + }, { "path": "PaymentCode/PaymentCode", "style": { diff --git a/pos-uni/pages/my/my.vue b/pos-uni/pages/my/my.vue index 79cdbee96..e0e7f5121 100644 --- a/pos-uni/pages/my/my.vue +++ b/pos-uni/pages/my/my.vue @@ -21,15 +21,15 @@ 消息通知 - + 服务条款 - + 关于我们 - + 隐私协议 @@ -107,6 +107,23 @@ }, goback() { uni.navigateBack() + }, + goServiceList() { + uni.navigateTo({ + url: '/pagesHome/outher/serviceList' + }) + }, + + goMyList() { + uni.navigateTo({ + url: '/pagesHome/outher/my' + }) + }, + + goYinsi() { + uni.navigateTo({ + url: '/pagesHome/outher/yinsi' + }) } } } diff --git a/pos-uni/pagesHome/AddVip/AddCode.vue b/pos-uni/pagesHome/AddVip/AddCode.vue index 88d56dfea..9bd90397e 100644 --- a/pos-uni/pagesHome/AddVip/AddCode.vue +++ b/pos-uni/pagesHome/AddVip/AddCode.vue @@ -25,6 +25,8 @@ @@ -224,4 +363,56 @@ font-size: 16px; color: #0864E9; } + + .time { + font-weight: 500; + font-size: 14px; + color: #333333; + margin: 0px auto; + margin-top: 15px; + } + + .time-bs { + width: 100%; + box-sizing: border-box; + background: #FFFFFF; + padding: 15px; + display: flex; + align-items: center; + justify-content: space-around; + } + + .time-bs2 { + width: 100%; + box-sizing: border-box; + background: #FFFFFF; + padding: 30px; + // display: flex; + align-items: center; + justify-content: space-around; + } + + .time-box { + border: 1px solid #0864E9; + box-sizing: border-box; + padding: 5px 15px; + border-radius: 8px; + font-size: 14px; + color: #333; + display: flex; + align-items: center; + justify-content: center; + } + + .time-box2 { + border: 1px solid #0864E9; + box-sizing: border-box; + padding: 5px 15px; + border-radius: 8px; + font-size: 14px; + color: #333; + display: flex; + align-items: center; + justify-content: center; + } \ No newline at end of file diff --git a/pos-uni/pagesHome/outher/my.vue b/pos-uni/pagesHome/outher/my.vue new file mode 100644 index 000000000..756b12388 --- /dev/null +++ b/pos-uni/pagesHome/outher/my.vue @@ -0,0 +1,247 @@ + + + + + \ No newline at end of file diff --git a/pos-uni/pagesHome/outher/serviceList.vue b/pos-uni/pagesHome/outher/serviceList.vue new file mode 100644 index 000000000..a934d0921 --- /dev/null +++ b/pos-uni/pagesHome/outher/serviceList.vue @@ -0,0 +1,245 @@ + + + + + \ No newline at end of file diff --git a/pos-uni/pagesHome/outher/yinsi.vue b/pos-uni/pagesHome/outher/yinsi.vue new file mode 100644 index 000000000..cf0f906d5 --- /dev/null +++ b/pos-uni/pagesHome/outher/yinsi.vue @@ -0,0 +1,247 @@ + + + + + \ No newline at end of file From 946815ef2e06f8f2ad72989fbe41d11adaee2d20 Mon Sep 17 00:00:00 2001 From: xvv Date: Wed, 29 May 2024 15:34:23 +0800 Subject: [PATCH 08/12] =?UTF-8?q?pos=20=E7=AB=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pos-uni/pages/index/index.vue | 170 +++++++++++++++++++++- pos-uni/pagesHome/orderList/orderList.vue | 26 ++-- 2 files changed, 184 insertions(+), 12 deletions(-) diff --git a/pos-uni/pages/index/index.vue b/pos-uni/pages/index/index.vue index c7a4faf5f..635f93c98 100644 --- a/pos-uni/pages/index/index.vue +++ b/pos-uni/pages/index/index.vue @@ -66,6 +66,28 @@ 您有新的交易日报生成，请点击查看 --> + + + + 已支付 + 已退款 + 未支付 + + + + 订单号: {{item.orderNo}} + + 油号:{{item.oilName}} + 升数:{{item.shengshu}}L + 下单时间:{{item.payTime}} + + 应付:￥{{item.goodsMoney}} + 优惠:￥0.00 + + + + 实付:￥{{item.payMoney}} + @@ -83,16 +105,26 @@ List: [], show: false, status: 'loading', + orderList: [], indexData: { totalPayMoney: '0', totalCount: '0', totalRefund: '0', - } + }, + form: { + page: 1, + pageSize: 10, + status: '', + startTime: '', + endTime: '', + payType: '' + }, } }, onShow() { // this.actList = ["1", "1", "1", "1", "1", ] // this.status = "nomore" 底部刷新结束 + this.getPageListByPos() this.getIndexData(); }, onPullDownRefresh() { @@ -110,6 +142,24 @@ tabbar }, methods: { + getPageListByPos() { + + + request({ + url: 'business/allOrderInfo/getPageListByPos', + method: 'get', + params: this.form + }).then((res) => { + if (res.code == 200) { + this.orderList = res.data.records; + } else { + uni.showToast({ + title: res.data, + icon: "none" + }) + } + }) + }, goRecharge() { uni.navigateTo({ url: "/pagesHome/MemberRecharge/MemberRecharge" @@ -294,4 +344,122 @@ overflow: hidden; margin-left: 10px; } + + .box_ { + width: 95%; + border-radius: 8px; + background: #fff; + box-sizing: border-box; + padding: 15px; + margin: 15px auto; + + } + + .b-bx { + width: 100%; + display: flex; + align-items: center; + justify-content: space-between; + margin-bottom: 10px; + } + + .title_ { + font-weight: bold; + font-size: 16px; + color: #333333; + } + + .zt-size { + font-weight: bold; + font-size: 16px; + color: #FD504E; + } + + .centne { + display: flex; + } + + .touxiang { + width: 60px; + height: 60px; + border-radius: 50%; + background: #D9D9D9; + margin-right: 15px; + } + + .right-centne { + width: 100%; + font-size: 14px; + } + + .h_ { + width: 100%; + margin-bottom: 5px; + } + + .end-box { + width: 100%; + text-align: right; + font-weight: bold; + font-size: 16px; + color: #0864E9; + } + + .time { + font-weight: 500; + font-size: 14px; + color: #333333; + margin: 0px auto; + margin-top: 15px; + } + + .time-bs { + width: 100%; + box-sizing: border-box; + background: #FFFFFF; + padding: 15px; + display: flex; + align-items: center; + justify-content: space-around; + } + + .time-bs2 { + width: 100%; + box-sizing: border-box; + background: #FFFFFF; + padding: 30px; + // display: flex; + align-items: center; + justify-content: space-around; + } + + .time-box { + border: 1px solid #0864E9; + box-sizing: border-box; + padding: 5px 15px; + border-radius: 8px; + font-size: 14px; + color: #333; + display: flex; + align-items: center; + justify-content: center; + } + + .time-box2 { + border: 1px solid #0864E9; + box-sizing: border-box; + padding: 5px 15px; + border-radius: 8px; + font-size: 14px; + color: #333; + display: flex; + align-items: center; + justify-content: center; + } + + .hao_ { + width: 30%; + font-weight: bold; + margin-right: 5px; + } \ No newline at end of file diff --git a/pos-uni/pagesHome/orderList/orderList.vue b/pos-uni/pagesHome/orderList/orderList.vue index 5dd6a4ae3..72f05cf5e 100644 --- a/pos-uni/pagesHome/orderList/orderList.vue +++ b/pos-uni/pagesHome/orderList/orderList.vue @@ -22,18 +22,15 @@ 未支付 - - - - - 订单号:{{item.orderNo}} - 油号:{{item.oilName}} - 升数:{{item.shengshu}}L - 下单时间:{{item.payTime}} + 订单号: {{item.orderNo}} + + 油号:{{item.oilName}} + 升数:{{item.shengshu}}L + 下单时间:{{item.payTime}} - 应付:￥{{item.goodsMoney}} - 优惠:￥0.00 + 应付:￥{{item.goodsMoney}} + 优惠:￥0.00 @@ -348,11 +345,12 @@ } .right-centne { - width: 70%; + width: 100%; font-size: 14px; } .h_ { + width: 100%; margin-bottom: 5px; } @@ -415,4 +413,10 @@ align-items: center; justify-content: center; } + + .hao_ { + width: 30%; + font-weight: bold; + margin-right: 5px; + } \ No newline at end of file From 827cb66e35376351e3c3abeda6dab3eab0f859f0 Mon Sep 17 00:00:00 2001 From: cun-nan <19819293608@163.com> Date: Wed, 29 May 2024 17:24:00 +0800 Subject: [PATCH 09/12] bug --- .../MemberRecharge/MemberRecharge.vue | 66 +++++++++++++++++-- 1 file changed, 59 insertions(+), 7 deletions(-) diff --git a/pos-uni/pagesHome/MemberRecharge/MemberRecharge.vue b/pos-uni/pagesHome/MemberRecharge/MemberRecharge.vue index 4309839da..044a67053 100644 --- a/pos-uni/pagesHome/MemberRecharge/MemberRecharge.vue +++ b/pos-uni/pagesHome/MemberRecharge/MemberRecharge.vue @@ -43,7 +43,13 @@ - {{item}} + {{item.rechargeBalance}}元 + + + + + + @@ -56,7 +62,7 @@ 微信扫码支付 - + @@ -69,7 +75,7 @@ 支付宝扫码支付 - + @@ -82,7 +88,7 @@ 银联扫码支付 - + @@ -95,7 +101,7 @@ 现金支付 - + @@ -131,6 +137,12 @@ isChooseUser: false, userId: "", userInfo: "", + order: { + paymentType: "WECHAT" + }, + value: "", + realyPayBills: 0, + authCode: "", } }, onLoad(e) { @@ -143,6 +155,7 @@ onShow() { // this.actList = ["1", "1", "1", "1", "1", ] // this.status = "nomore" 底部刷新结束 + this.getRechargeAmount() }, onPullDownRefresh() { console.log("刷新"); @@ -158,9 +171,26 @@ headers }, methods: { - getmemberId(num) { + // 自定义金额 + custom(val) { + this.order.amount = val + }, + // 获取充值金额列表 + getRechargeAmount() { + request({ + url: 'business/marketingActivity/cardFuelDiesel', + method: 'get', + params: { + pageNo: 1, + pageSize: 10000 + } + }).then((res) => { + this.numList = res.data.records + }) + }, + getmemberId(num, payType) { this.memberId = num - console.log(this.memberId); + this.order.paymentType = payType }, // 获取用户信息 getUser() { @@ -180,6 +210,28 @@ this.listindex = index }, govipjs() { + let actualPayment = 0 + if (!this.userInfo) { + uni.showToast({ + title: "请先选择会员", + icon: "none" + }) + } + if (this.order.paymentType == "CASH") actualPayment = this.authCode + // 会员id 会员名字会员手机号码 + this.order.mtUserId = this.userInfo.id + this.order.name = this.userInfo.name + this.order.mobile = this.userInfo.mobile + // 支付码 + this.order.authCode = this.authCode + this.order.realyPayBills = this.realyPayBills + this.order.actualPayment = actualPayment + // if (!this.userInfo){ + // uni.showToast({ + // title:"请先选择会员", + // icon:"none" + // }) + // } // uni.navigateTo({ // url: '/pagesHome/MemberRecharge/list' // }) From a7792e4b20a381e7b9581567a2f32828c1a9b059 Mon Sep 17 00:00:00 2001 From: cun-nan <19819293608@163.com> Date: Wed, 29 May 2024 17:37:23 +0800 Subject: [PATCH 10/12] bug --- .../impl/CardFuelRecordServiceImpl.java | 1 + .../MemberRecharge/MemberRecharge.vue | 58 ++++++++++++++----- 2 files changed, 45 insertions(+), 14 deletions(-) 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 9a42ce94e..d85e75b9a 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 @@ -211,6 +211,7 @@ public class CardFuelRecordServiceImpl implements CardFuelRecordService { cardFuelRecordDTO.setStoreId(nowAccountInfo.getStoreId()); cardFuelRecordDTO.setChainStoreId(nowAccountInfo.getChainStoreId()); cardFuelRecordDTO.setPayAmount(cardFuelRecordDTO.getRechargeBalance()); + cardFuelRecordDTO.setMtStaffId(nowAccountInfo.getStaffId()); LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); diff --git a/pos-uni/pagesHome/MemberRecharge/MemberRecharge.vue b/pos-uni/pagesHome/MemberRecharge/MemberRecharge.vue index 044a67053..456c8ad7a 100644 --- a/pos-uni/pagesHome/MemberRecharge/MemberRecharge.vue +++ b/pos-uni/pagesHome/MemberRecharge/MemberRecharge.vue @@ -41,12 +41,12 @@ 充值记录 - + {{item.rechargeBalance}}元 - + @@ -174,6 +174,7 @@ // 自定义金额 custom(val) { this.order.amount = val + this.realyPayBills = this.order.amount }, // 获取充值金额列表 getRechargeAmount() { @@ -206,17 +207,44 @@ url: "/pagesHome/searchVip/searchVip?type=1" }) }, - getindex(index) { + getindex(index,data) { this.listindex = index + if (data){ + this.order.amount = data.rechargeBalance + this.order.rechargeBalance = data.rechargeBalance + this.order.points = data.points + this.realyPayBills = data.rechargeBalance + } }, - govipjs() { - let actualPayment = 0 + // 二维码 + scanQrcode() { if (!this.userInfo) { uni.showToast({ title: "请先选择会员", icon: "none" }) } + if (!this.order.amount){ + uni.showToast({ + title:"请先选择充值金额", + icon:"none" + }) + } + let _this = this + uni.scanCode({ + onlyFromCamera: true, + success: (res) => { + console.log('扫描二维码成功,结果:' + JSON.stringify(res) + res.result); + _this.authCode = res.result + _this.govipjs() + }, + error: (res) => { + console.log('扫描二维码出现错误') + } + }) + }, + govipjs() { + let actualPayment = 0 if (this.order.paymentType == "CASH") actualPayment = this.authCode // 会员id 会员名字会员手机号码 this.order.mtUserId = this.userInfo.id @@ -226,15 +254,17 @@ this.order.authCode = this.authCode this.order.realyPayBills = this.realyPayBills this.order.actualPayment = actualPayment - // if (!this.userInfo){ - // uni.showToast({ - // title:"请先选择会员", - // icon:"none" - // }) - // } - // uni.navigateTo({ - // url: '/pagesHome/MemberRecharge/list' - // }) + + request({ + url: 'business/marketingActivity/cardFuelRecord/prepaidFuelTopUp', + method: 'post', + data:this.order + }).then((res) => { + // uni.navigateTo({ + // url: '/pagesHome/PaymentResults/PaymentResults' + // }) + }) + }, goback() { uni.navigateBack() From 49666799a45c2a51a1832c85cfc6f9b74bd4dead Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=BD=90=E5=A4=A9=E5=A4=A7=E5=9C=A3?= <17615834396@163.com> Date: Wed, 29 May 2024 17:42:11 +0800 Subject: [PATCH 11/12] bug --- pos-uni/pages/index/index.vue | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pos-uni/pages/index/index.vue b/pos-uni/pages/index/index.vue index 635f93c98..b37f0c6e8 100644 --- a/pos-uni/pages/index/index.vue +++ b/pos-uni/pages/index/index.vue @@ -89,6 +89,7 @@ 实付:￥{{item.payMoney}} + @@ -146,7 +147,7 @@ request({ - url: 'business/allOrderInfo/getPageListByPos', + url: 'business/allOrderInfo/getPageListByPosRecentThree', method: 'get', params: this.form }).then((res) => { From 543eb2d35ebd80ec8692e13d74337e523ed7852e Mon Sep 17 00:00:00 2001 From: "DESKTOP-369JRHT\\12997" <9> Date: Thu, 30 May 2024 16:05:16 +0800 Subject: [PATCH 12/12] no message --- .../printer/controller/printerController.java | 2 +- .../printer/service/impl/PrinterServiceImpl.java | 14 ++++++++++---- fuintCashierWeb/src/views/details/index.vue | 1 - pos-uni/pages/my/my.vue | 2 +- pos-uni/pagesHome/orderList/orderList.vue | 1 - pos-uni/pagesHome/outher/serviceList.vue | 8 ++++++-- 6 files changed, 18 insertions(+), 10 deletions(-) diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/printer/controller/printerController.java b/fuintBackend/fuint-application/src/main/java/com/fuint/business/printer/controller/printerController.java index 10c16e20d..a09180137 100644 --- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/printer/controller/printerController.java +++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/printer/controller/printerController.java @@ -78,7 +78,7 @@ public class printerController extends BaseController { @RequestParam("additional_data") String additional_data, @RequestParam("iv") String iv, @RequestParam("signature") String signature){ - log.info("12222222222222222222222222"); + log.info("------push-------"); return printerService.PostPush(ciphertext,nonce,tag,additional_data,iv,signature); } diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/printer/service/impl/PrinterServiceImpl.java b/fuintBackend/fuint-application/src/main/java/com/fuint/business/printer/service/impl/PrinterServiceImpl.java index 50bf3268a..91276ef65 100644 --- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/printer/service/impl/PrinterServiceImpl.java +++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/printer/service/impl/PrinterServiceImpl.java @@ -66,15 +66,20 @@ public class PrinterServiceImpl implements PrinterService { // 使用 Fastjson 将 JSON 字符串解析为 JSONObject JSONObject jsonObject = JSON.parseObject(decrypte); + log.info("--回调支付--{}",jsonObject); // 将 JSONObject 转换为 Map Map map = jsonObject.getInnerMap(); //获取支付参数 - Map orderPaymentMap = (Map) map.get("order_payment"); +// Map orderPaymentMap = (Map) map.get("order_payment"); + Map orderPaymentMap = (Map) map.get("order_other"); + log.info("--回调支付--{}",orderPaymentMap.get("scanned_code").toString()); + OrderPayment orderPayment = new OrderPayment(); - orderPayment.setOrderPayment(orderPaymentMap.get("pay_amount").toString()); +// orderPayment.setOrderPayment(orderPaymentMap.get("pay_amount").toString()); orderPayment.setScannedCode(orderPaymentMap.get("scanned_code").toString()); - RedisUtil.set(orderPaymentMap.get("scanned_code").toString(), orderPaymentMap.get("pay_amount").toString(), 100); +// RedisUtil.set(orderPaymentMap.get("scanned_code").toString(), orderPaymentMap.get("pay_amount").toString(), 100); + RedisUtil.set(orderPaymentMap.get("scanned_code").toString(), 100); code = orderPaymentMap.get("scanned_code").toString(); log.info("--获取打印回调--{}",jsonObject); } catch (Exception e) { @@ -148,7 +153,7 @@ public class PrinterServiceImpl implements PrinterService { // HashMap objectObjectHashMap = new HashMap<>(); Map orderPaymentMap = new HashMap<>(); - orderPaymentMap.put("pay_amount", payAmount); + orderPaymentMap.put("pay_amount", payAmount.toString()); // orderPaymentMap.put("pay_amount", 0.01); orderPaymentMap.put("pay_amount_source", 3); @@ -162,6 +167,7 @@ public class PrinterServiceImpl implements PrinterService { String json = gson.toJson(jsonDataMap); String jsonData = ""+json+""; +// String jsonData = "{\"order_payment\":{\"pay_amount\":\"1\",\"pay_amount_source\":3},\"processed_state\":0}"; log.info("json:{}",jsonData); String url=m.print(infoByStoreId.getMachineCode(),jsonData, System.currentTimeMillis()+random6.toString()); diff --git a/fuintCashierWeb/src/views/details/index.vue b/fuintCashierWeb/src/views/details/index.vue index 616885019..2c9363c97 100644 --- a/fuintCashierWeb/src/views/details/index.vue +++ b/fuintCashierWeb/src/views/details/index.vue @@ -175,7 +175,6 @@
赠送{{ item.giftBalance }}元
-
diff --git a/pos-uni/pages/my/my.vue b/pos-uni/pages/my/my.vue index 16024fa55..d2f77ae9f 100644 --- a/pos-uni/pages/my/my.vue +++ b/pos-uni/pages/my/my.vue @@ -25,7 +25,7 @@ ======= --> - + 服务条款 diff --git a/pos-uni/pagesHome/orderList/orderList.vue b/pos-uni/pagesHome/orderList/orderList.vue index 5dd6a4ae3..2e45df3ea 100644 --- a/pos-uni/pagesHome/orderList/orderList.vue +++ b/pos-uni/pagesHome/orderList/orderList.vue @@ -94,7 +94,6 @@ ], orderList: [], baseUrl: config.baseUrl, - // baseUrl: 'https://www.tuofeng.cc/oilAdmin/static/uploadImages/20240529/e776bf37b3f843028846cbdf3fbd958d.jpg', form: { page: 1, pageSize: 10, diff --git a/pos-uni/pagesHome/outher/serviceList.vue b/pos-uni/pagesHome/outher/serviceList.vue index a934d0921..2d74eb386 100644 --- a/pos-uni/pagesHome/outher/serviceList.vue +++ b/pos-uni/pagesHome/outher/serviceList.vue @@ -4,7 +4,9 @@ 服务条款 - 委托方（甲方）： + +

+ 委托方（甲方）： 法定代表人： @@ -143,7 +145,9 @@ 签约时间： 签约时间： - 签订地点： 签订地点： + 签订地点： 签订地点： +

+