From 686a0d2e03e1f99309324c2e88699f516c5ce8bb Mon Sep 17 00:00:00 2001 From: cun-nan <19819293608@163.com> Date: Fri, 12 Jan 2024 18:03:02 +0800 Subject: [PATCH 1/6] bug --- fuintAdmin/src/views/power/payment/index.vue | 2 ++ fuintAdmin_zt/src/api/login.js | 9 ++++++ .../src/api/payConfig/merchantconfig.js | 11 +++++++- .../src/views/components/Service/payment.vue | 28 ++++++++++++++++++- .../controller/MerchantConfigController.java | 13 ++++++++- .../fuyou/service/MerchantConfigService.java | 7 +++++ .../impl/MerchantConfigServiceImpl.java | 9 ++++-- .../fuint/common/shiroConfig/ShiroConfig.java | 2 ++ 8 files changed, 76 insertions(+), 5 deletions(-) diff --git a/fuintAdmin/src/views/power/payment/index.vue b/fuintAdmin/src/views/power/payment/index.vue index db16d294e..f4b1cf33e 100644 --- a/fuintAdmin/src/views/power/payment/index.vue +++ b/fuintAdmin/src/views/power/payment/index.vue @@ -291,6 +291,8 @@ export default { this.$modal.msgSuccess("添加成功"); this.getList() this.dialogVisible = false + }else { + this.$modal.msgError("添加失败，此通道暂未配置"); } }) } diff --git a/fuintAdmin_zt/src/api/login.js b/fuintAdmin_zt/src/api/login.js index fca43c04c..11b9aa9ad 100644 --- a/fuintAdmin_zt/src/api/login.js +++ b/fuintAdmin_zt/src/api/login.js @@ -26,6 +26,15 @@ export function getInfo() { }) } +// 获取手机验证码 +export function gettelcode(data) { + return request({ + url: 'backendApi/login/sendMsg', + method: 'post', + data:data + }) +} + // 退出方法 export function logout() { return request({ diff --git a/fuintAdmin_zt/src/api/payConfig/merchantconfig.js b/fuintAdmin_zt/src/api/payConfig/merchantconfig.js index c65cbc22d..0006b2d5e 100644 --- a/fuintAdmin_zt/src/api/payConfig/merchantconfig.js +++ b/fuintAdmin_zt/src/api/payConfig/merchantconfig.js @@ -28,6 +28,15 @@ export function editMerchant(data) { }) } +// 修改商户备注信息 +export function editMerchantRemark(data) { + return request({ + url: '/api/merchantConfig/edit', + method: 'post', + data: data, + }) +} + // 添加商户使用状态 export function addMerchantApi(data) { @@ -44,4 +53,4 @@ export function merchantInfo(id) { url: '/api/merchantConfig/'+id, method: 'get', }) -} \ No newline at end of file +} diff --git a/fuintAdmin_zt/src/views/components/Service/payment.vue b/fuintAdmin_zt/src/views/components/Service/payment.vue index 75fe90b7a..fb786cc8d 100644 --- a/fuintAdmin_zt/src/views/components/Service/payment.vue +++ b/fuintAdmin_zt/src/views/components/Service/payment.vue @@ -38,7 +38,23 @@ 当前使用中
商户编号: {{ item.mchntCd }}
-
备注: {{ item.remark ? item.remark : "--" }}
+
+ 备注: {{ item.remark ? item.remark : "--" }} + + 修改 + 删除 + +
@@ -268,6 +284,16 @@ export default { this.getList(); }, methods:{ + handleUpdate(data){ + merchantInfo(data.id).then(res => { + this.title = "商户信息" + this.dialogVisible = true + this.form1 = res.data + }) + }, + handleDelete(data){ + + }, // 修改商户备注信息 submitRemark(){ editMerchantRemark(this.merchantConfig).then(res => { diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/api/fuyou/controller/MerchantConfigController.java b/fuintBackend/fuint-application/src/main/java/com/fuint/api/fuyou/controller/MerchantConfigController.java index 3432f704c..71e202956 100644 --- a/fuintBackend/fuint-application/src/main/java/com/fuint/api/fuyou/controller/MerchantConfigController.java +++ b/fuintBackend/fuint-application/src/main/java/com/fuint/api/fuyou/controller/MerchantConfigController.java @@ -66,8 +66,9 @@ public class MerchantConfigController extends BaseController { public ResponseObject selectMerchant(@PathVariable Integer id){ return getSuccessResult(merchantConfigService.selectMerchById(id)); } + /** - * 修改商户备注信息 + * 修改商户信息 * @param merchantConfig * @return */ @@ -75,4 +76,14 @@ public class MerchantConfigController extends BaseController { public ResponseObject editMerchantRemark(@RequestBody MerchantConfig merchantConfig){ return getSuccessResult(merchantConfigService.updateMerchRemark(merchantConfig)); } + + /** + * 删除商户信息 + * @param id + * @return + */ + @DeleteMapping("{id}") + public ResponseObject delete(@PathVariable Integer id){ + return getSuccessResult(merchantConfigService.deleteMerch(id)); + } } diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/api/fuyou/service/MerchantConfigService.java b/fuintBackend/fuint-application/src/main/java/com/fuint/api/fuyou/service/MerchantConfigService.java index e32487b6b..e87aa2999 100644 --- a/fuintBackend/fuint-application/src/main/java/com/fuint/api/fuyou/service/MerchantConfigService.java +++ b/fuintBackend/fuint-application/src/main/java/com/fuint/api/fuyou/service/MerchantConfigService.java @@ -90,4 +90,11 @@ public interface MerchantConfigService extends IService { * @return */ public int insertMerch(MerchantConfig merchantConfig); + + /** + * 根据id删除配置信息 + * @param id + * @return + */ + public int deleteMerch(Integer id); } diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/api/fuyou/service/impl/MerchantConfigServiceImpl.java b/fuintBackend/fuint-application/src/main/java/com/fuint/api/fuyou/service/impl/MerchantConfigServiceImpl.java index b1f09d808..c50b65c14 100644 --- a/fuintBackend/fuint-application/src/main/java/com/fuint/api/fuyou/service/impl/MerchantConfigServiceImpl.java +++ b/fuintBackend/fuint-application/src/main/java/com/fuint/api/fuyou/service/impl/MerchantConfigServiceImpl.java @@ -99,10 +99,9 @@ public class MerchantConfigServiceImpl extends ServiceImpl(); queryWrapper.eq("is_use",1); - queryWrapper.eq("store_id",nowAccountInfo.getStoreId()); + queryWrapper.eq("store_id",merchantConfig.getStoreId()); List list = baseMapper.selectList(queryWrapper); for (MerchantConfig config : list) { config.setIsUse("0"); @@ -149,6 +148,7 @@ public class MerchantConfigServiceImpl extends ServiceImpl Date: Sat, 13 Jan 2024 09:49:42 +0800 Subject: [PATCH 2/6] =?UTF-8?q?=E4=BF=AE=E6=94=B9bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../EventMarketing/activeNewlyweds/index.vue | 4 ++-- .../EventMarketing/activeRecommend/index.vue | 8 +++---- .../EventMarketing/cardFavorable/index.vue | 3 +++ .../views/EventMarketing/giftBlock/index.vue | 3 +-- .../EventMarketing/storeOilBlock/index.vue | 21 ++++++++++++++++--- gasStation-uni/pagesMy/Coupons/Coupons.vue | 2 +- 6 files changed, 29 insertions(+), 12 deletions(-) diff --git a/fuintAdmin/src/views/EventMarketing/activeNewlyweds/index.vue b/fuintAdmin/src/views/EventMarketing/activeNewlyweds/index.vue index ddf295d2c..3c08d97d7 100644 --- a/fuintAdmin/src/views/EventMarketing/activeNewlyweds/index.vue +++ b/fuintAdmin/src/views/EventMarketing/activeNewlyweds/index.vue @@ -476,7 +476,7 @@ label="券详情" width="100">
- - + - + { + if(res.code == 200){ + this.tableData = res.data.records + this.total = res.data.total; + } + })*/ this.oilList = [] oilName(this.queryParams.type).then(res=>{ this.oilList = res.data.records console.log('我的油站' ,res) }) + }, getlist(){ this.queryParams.pageNo=this.pageNo diff --git a/gasStation-uni/pagesMy/Coupons/Coupons.vue b/gasStation-uni/pagesMy/Coupons/Coupons.vue index ce675fab5..d1e913864 100644 --- a/gasStation-uni/pagesMy/Coupons/Coupons.vue +++ b/gasStation-uni/pagesMy/Coupons/Coupons.vue @@ -177,7 +177,7 @@ }, goRecharge(id, cardRecordId) { uni.navigateTo({ - url: '/pagesHome/oilRecharge/oilRecharge?id=0&cardFavorableId=' + id + + url: '/pages/refuel/refuel?id=0&cardFavorableId=' + id + '&cardRecordId=' + cardRecordId }) From 3892bd0e214de6bcd22a6498d57088e3f6314de0 Mon Sep 17 00:00:00 2001 From: cun-nan <19819293608@163.com> Date: Sat, 13 Jan 2024 10:35:03 +0800 Subject: [PATCH 3/6] bug --- fuintAdmin/src/api/order/oilorder.js | 8 ++++ fuintAdmin/src/views/member/userInfo.vue | 38 ++++++++++----- .../src/api/payConfig/merchantconfig.js | 9 ++++ .../src/views/components/Service/payment.vue | 47 ++++++++++++++----- .../impl/MerchantConfigServiceImpl.java | 8 ++-- .../impl/CardFuelRecordServiceImpl.java | 8 +++- .../service/impl/CardGiftServiceImpl.java | 7 ++- .../impl/CardValueRecordServiceImpl.java | 8 +++- .../order/controller/OilOrderController.java | 10 ++++ .../business/order/mapper/OilOrderMapper.java | 7 +++ .../order/mapper/xml/OilOrderMapper.xml | 6 +++ .../order/service/OilOrderService.java | 6 +++ .../service/impl/OilOrderServiceImpl.java | 6 +++ .../userManager/mapper/xml/LJUserMapper.xml | 3 +- .../service/impl/LJUserServiceImpl.java | 4 +- .../views/cashier/vipComponents/vipList.vue | 3 +- 16 files changed, 139 insertions(+), 39 deletions(-) diff --git a/fuintAdmin/src/api/order/oilorder.js b/fuintAdmin/src/api/order/oilorder.js index 8f4b06997..90b388e95 100644 --- a/fuintAdmin/src/api/order/oilorder.js +++ b/fuintAdmin/src/api/order/oilorder.js @@ -61,3 +61,11 @@ export function oilOrderList(data) { data: data }) } + +// 根据订单号模糊查询油品订单信息 +export function getOilOrderAllAmount(id) { + return request({ + url: '/business/oilOrder/getAllAmount/'+id, + method: 'get', + }) +} diff --git a/fuintAdmin/src/views/member/userInfo.vue b/fuintAdmin/src/views/member/userInfo.vue index fbf9ffc42..7df24b14b 100644 --- a/fuintAdmin/src/views/member/userInfo.vue +++ b/fuintAdmin/src/views/member/userInfo.vue @@ -37,7 +37,7 @@ {{ form.consumeNum }} - {{ form.refuelMoney ? form.refuelMoney : "--" }} + {{ allAmount || 0 }} {{ form.createTime }} @@ -105,7 +105,7 @@ @@ -797,6 +797,7 @@ import { editCardValueChild, listCardValueChild, listCardValueChildOrder } from "@/api/staff/user/cardvaluechild"; +import {getOilOrderAllAmount} from "@/api/order/oilorder"; export default { components: { @@ -925,7 +926,10 @@ export default { id: '', // 会员信息 form: {}, + refuelMoney:0, form1: {}, + // 加油总金额 + allAmount:0, // 店铺信息 store: '', // 会员等级信息 @@ -975,6 +979,7 @@ export default { this.getStore(); this.getCardList() this.getOrderList() + this.getAllAmount() }, methods: { handleQuery(){ @@ -1054,7 +1059,6 @@ export default { allFixingLevel().then(res => { if (res.code == 200) { this.fixingLevelList = res.data - console.log(res.data) } }) }, @@ -1107,9 +1111,9 @@ export default { await getCardValueListApi(quy).then(res => { this.cardValueList = res.data.records; this.cardValueList.sort((a, b) => a.rechargeBalance - b.rechargeBalance); - console.log("this.grade.name",this.grade) + // console.log("this.grade.name",this.grade) }) - console.log("this.cardValueList", this.grade) + // console.log("this.cardValueList", this.grade) if (this.cardValueList.length > 0) { // 过滤 @@ -1130,7 +1134,7 @@ export default { // this.cardValueForm.amount = null this.$set(this.cardValueForm, 'amount', data); - console.log("data17.16", this.cardValueForm.amount) + // console.log("data17.16", this.cardValueForm.amount) if (!data) { this.cardValueForm.amount = '' @@ -1241,7 +1245,7 @@ export default { }, // 根据油品过滤查询存油卡 async tabOilTypeClick(data) { - console.log("aaaaaaaaaaaaaa",data) + // console.log("aaaaaaaaaaaaaa",data) await this.getCardFuelDieselList() this.cardFuelDieselList = this.sourceCardFuelDieselList.filter(item => { @@ -1253,7 +1257,7 @@ export default { }, selectOilType(status, oilType) { this.tabOilType = oilType; - console.log("453",oilType) + // console.log("453",oilType) this.tabOilTypeClick(oilType); }, // 查询员工 @@ -1334,10 +1338,18 @@ export default { // 获取会员详情 getUser(this.id).then(response => { this.form = response.data; - console.log(response.data) + if (response.data.refuelMoney){ + let refuelMoney = JSON.parse(response.data.refuelMoney) + _this.refuelMoney = parseFloat(refuelMoney[0].refuelMoney) + } this.getGrade(response.data.gradeId); }); }, + getAllAmount(){ + getOilOrderAllAmount(this.id).then(res => { + this.allAmount = res.data + }) + }, // 获取会员等级详情 getGrade(id) { getUserGradeInfo(id).then(response => { @@ -1352,7 +1364,7 @@ export default { }, // 选择余额充值金额 rechargeCard(index, item) { - console.log("index", index) + // console.log("index", index) // this.cardValueForm.amount = null, this.cardValueForm.rechargeType = 0 @@ -1406,7 +1418,7 @@ export default { let file = {} // 拿到金额 file = this.cardFuelDieselList[index] - console.log("file",file) + // console.log("file",file) this.cardFuelDieselForm.points = file.points this.cardFuelDieselForm.rechargeBalance = file.rechargeBalance this.cardFuelDieselForm.oilType = file.oilType @@ -1488,12 +1500,12 @@ export default { this.$message.error('请先扫码'); return } - console.log("cardFuelDieselForm",this.cardFuelDieselForm) + // console.log("cardFuelDieselForm",this.cardFuelDieselForm) this.cardFuelDieselForm.mtUserId = userForm.id this.cardFuelDieselForm.name = userForm.name this.cardFuelDieselForm.mobile = userForm.mobile this.cardFuelDieselForm.authCode = this.authCode - console.log("this.cardFuelDieselForm",this.cardFuelDieselForm) + // console.log("this.cardFuelDieselForm",this.cardFuelDieselForm) let id; diff --git a/fuintAdmin_zt/src/api/payConfig/merchantconfig.js b/fuintAdmin_zt/src/api/payConfig/merchantconfig.js index 0006b2d5e..537988303 100644 --- a/fuintAdmin_zt/src/api/payConfig/merchantconfig.js +++ b/fuintAdmin_zt/src/api/payConfig/merchantconfig.js @@ -54,3 +54,12 @@ export function merchantInfo(id) { method: 'get', }) } + +// 根据id删除商户配置信息 +export function deleteMerchant(id) { + return request({ + url: '/api/merchantConfig/'+id, + method: 'delete', + }) +} + diff --git a/fuintAdmin_zt/src/views/components/Service/payment.vue b/fuintAdmin_zt/src/views/components/Service/payment.vue index fb786cc8d..12248b710 100644 --- a/fuintAdmin_zt/src/views/components/Service/payment.vue +++ b/fuintAdmin_zt/src/views/components/Service/payment.vue @@ -38,9 +38,11 @@ 当前使用中
商户编号: {{ item.mchntCd }}
-
- 备注: {{ item.remark ? item.remark : "--" }} - +
+ + 备注: {{ item.remark ? item.remark : "--" }} + + import { - addMerchantApi, + addMerchantApi, deleteMerchant, editMerchant, editMerchantRemark, listMerchant, @@ -292,7 +294,14 @@ export default { }) }, handleDelete(data){ - + let name = data.remark ? data.merchantName + "(" + data.remark + ")" : data.merchantName + this.$modal.confirm('是否确认删除"' + name + '"的支付配置信息？').then(function () { + return deleteMerchant(data.id); + }).then(() => { + this.getList(); + this.$modal.msgSuccess("删除成功"); + }).catch(() => { + }); }, // 修改商户备注信息 submitRemark(){ @@ -316,14 +325,26 @@ export default { console.log("hello world") this.$refs["form1"].validate(valid => { if (valid) { - this.form1.storeId = this.id - addMerchantApi(this.form1).then(res => { - if (res.data == 1){ - this.$modal.msgSuccess("添加成功"); - this.getList() - this.dialogVisible = false - } - }) + if (this.form1.id){ + editMerchantRemark(this.form1).then(res => { + if (res.data===1){ + this.$modal.msgSuccess("修改成功") + this.getList() + this.show = false + } + }) + }else { + this.form1.storeId = this.id + addMerchantApi(this.form1).then(res => { + if (res.data == 1){ + this.$modal.msgSuccess("添加成功"); + this.getList() + this.dialogVisible = false + }else { + this.$modal.msgError("添加失败，当前通道未配置") + } + }) + } } }) }, diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/api/fuyou/service/impl/MerchantConfigServiceImpl.java b/fuintBackend/fuint-application/src/main/java/com/fuint/api/fuyou/service/impl/MerchantConfigServiceImpl.java index c50b65c14..098d9b9d5 100644 --- a/fuintBackend/fuint-application/src/main/java/com/fuint/api/fuyou/service/impl/MerchantConfigServiceImpl.java +++ b/fuintBackend/fuint-application/src/main/java/com/fuint/api/fuyou/service/impl/MerchantConfigServiceImpl.java @@ -134,13 +134,11 @@ public class MerchantConfigServiceImpl extends ServiceImpl i //更新用户余额 Double cardAmount = one.getCardAmount(); //会员信息 - LJUserVo ljUserVo = ljUserMapper.selectUserById(userId); - UserBalance userBalance = userBalanceService.selectUserBalance(userId,ljUserVo.getChainStoreId()); +// LJUserVo ljUserVo = ljUserMapper.selectUserById(userId); +// UserBalance userBalance = userBalanceService.selectUserBalance(userId,ljUserVo.getChainStoreId()); + MtStore store = storeService.getById(cardGift.getStoreId()); + UserBalance userBalance = userBalanceService.selectUserBalance(userId,store.getChainStoreId()); Double cardBalance = userBalance.getCardBalance(); BigDecimal bigDecimal = BigDecimal.valueOf(cardAmount); BigDecimal bigDecimal1 = BigDecimal.valueOf(cardBalance); diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardValue/service/impl/CardValueRecordServiceImpl.java b/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardValue/service/impl/CardValueRecordServiceImpl.java index c31de24bb..b2da5208c 100644 --- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardValue/service/impl/CardValueRecordServiceImpl.java +++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardValue/service/impl/CardValueRecordServiceImpl.java @@ -41,6 +41,8 @@ import com.fuint.business.member.service.ILJStaffService; import com.fuint.business.order.entity.CardBalanceChange; import com.fuint.business.order.entity.CashierOrder; import com.fuint.business.order.service.CardBalanceChangeService; +import com.fuint.business.storeInformation.entity.LJStore; +import com.fuint.business.storeInformation.service.ILJStoreService; import com.fuint.business.userManager.entity.UserBalance; import com.fuint.business.userManager.mapper.LJUserMapper; import com.fuint.business.userManager.service.UserBalanceService; @@ -111,6 +113,8 @@ public class CardValueRecordServiceImpl extends ServiceImpl { List selectOilOrderListExcel(@Param("order") OilOrder order); + /** + * 根据userId和店铺id查询当前用户在此店铺加油的总金额 + * @param userId + * @return + */ + Double sumOilOrderAmountByUserIdAndStoreId(@Param("userId") Integer userId,@Param("storeId") Integer StoreId); + /** * 根据userid查询油品订单信息 * @param page diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/mapper/xml/OilOrderMapper.xml b/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/mapper/xml/OilOrderMapper.xml index 667d1b20b..ff74a7d55 100644 --- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/mapper/xml/OilOrderMapper.xml +++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/mapper/xml/OilOrderMapper.xml @@ -435,4 +435,10 @@ + 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 18d157989..7757f7fd4 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 @@ -28,6 +28,12 @@ public interface OilOrderService extends IService { void export(HttpServletResponse response, OilOrder order); + /** + * 根据userId和店铺id查询当前用户在此店铺加油的总金额 + * @param userId + * @return + */ + Double sumOilOrderAmountByUserIdAndStoreId(Integer userId); /** * 根据条件分页查询油品订单信息 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 4712dd8d6..b98c260c3 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 @@ -120,6 +120,12 @@ public class OilOrderServiceImpl extends ServiceImpl i } } + @Override + public Double sumOilOrderAmountByUserIdAndStoreId(Integer userId) { + AccountInfo nowAccountInfo = TokenUtil.getNowAccountInfo(); + return baseMapper.sumOilOrderAmountByUserIdAndStoreId(userId,nowAccountInfo.getStoreId()); + } + @Override public IPage selectOilOrderByUserId(Page page, OilOrder order) { AccountInfo nowAccountInfo = TokenUtil.getNowAccountInfo(); diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/userManager/mapper/xml/LJUserMapper.xml b/fuintBackend/fuint-application/src/main/java/com/fuint/business/userManager/mapper/xml/LJUserMapper.xml index 7d2e0b4f7..f3dff3c3b 100644 --- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/userManager/mapper/xml/LJUserMapper.xml +++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/userManager/mapper/xml/LJUserMapper.xml @@ -138,10 +138,9 @@ diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/userManager/service/impl/LJUserServiceImpl.java b/fuintBackend/fuint-application/src/main/java/com/fuint/business/userManager/service/impl/LJUserServiceImpl.java index c08df71c7..a504f1eff 100644 --- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/userManager/service/impl/LJUserServiceImpl.java +++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/userManager/service/impl/LJUserServiceImpl.java @@ -128,7 +128,9 @@ public class LJUserServiceImpl extends ServiceImpl impleme */ @Override public LJUserVo selectUserById(int id) { - return baseMapper.selectUserById(id); + AccountInfo nowAccountInfo = TokenUtil.getNowAccountInfo(); + LJStore store = storeService.selectStoreByStoreId(nowAccountInfo.getStoreId()); + return baseMapper.queryUserByChainStoreId(id,store.getChainStoreId()); } @Autowired diff --git a/fuintCashierWeb/src/views/cashier/vipComponents/vipList.vue b/fuintCashierWeb/src/views/cashier/vipComponents/vipList.vue index d1121bd3a..8acd893e9 100644 --- a/fuintCashierWeb/src/views/cashier/vipComponents/vipList.vue +++ b/fuintCashierWeb/src/views/cashier/vipComponents/vipList.vue @@ -230,7 +230,7 @@ @@ -521,6 +521,7 @@ name: "vipList", data(){ return{ + baseUrl:process.env.VUE_APP_BASE_API, // 公众号列表 officialList:[], result:{}, From 94b0dacae781552d3232d9a5966ebf5da0595f10 Mon Sep 17 00:00:00 2001 From: cun-nan <19819293608@163.com> Date: Sat, 13 Jan 2024 11:53:00 +0800 Subject: [PATCH 4/6] bug --- .../order/controller/HangBillController.java | 36 +++ .../business/order/mapper/HangBillMapper.java | 18 ++ .../order/mapper/xml/HangBillMapper.xml | 10 + .../order/mapper/xml/OilOrderMapper.xml | 2 +- .../order/service/HangBillService.java | 24 ++ .../service/impl/HangBillServiceImpl.java | 27 ++ .../service/impl/LJUserServiceImpl.java | 5 +- fuintCashierWeb/src/api/cashier/hangbill.js | 32 +++ .../views/cashier/NewComponents/credit.vue | 109 ++++---- .../views/cashier/vipComponents/vipList.vue | 250 ++++++------------ 10 files changed, 274 insertions(+), 239 deletions(-) diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/controller/HangBillController.java b/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/controller/HangBillController.java index 7094b36a1..b5d14b75a 100644 --- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/controller/HangBillController.java +++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/controller/HangBillController.java @@ -99,4 +99,40 @@ public class HangBillController extends BaseController { HangBill hangBill = hangBillService.selectHangBillByOrderNo(orderNo); return getSuccessResult(hangBill); } + + /** + * 查询当前店铺所有的订单总额 + * @return + */ + @GetMapping("allAmount") + public ResponseObject allAmount(){ + return getSuccessResult(hangBillService.selectAllAmount()); + } + + /** + * 查询当前店铺归还的账单总额 + * @return + */ + @GetMapping("allReturnAmount") + public ResponseObject allReturnAmount(){ + return getSuccessResult(hangBillService.selectReturnAmount()); + } + + /** + * 查询当前店铺未归还的账单总额 + * @return + */ + @GetMapping("allNoReturnAmount") + public ResponseObject allNoReturnAmount(){ + return getSuccessResult(hangBillService.selectNoReturnAmount()); + } + + /** + * 查询当前店铺归还账单的数量 + * @return + */ + @GetMapping("returnTotal") + public ResponseObject returnTotal(){ + return getSuccessResult(hangBillService.selectCountReturn()); + } } diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/mapper/HangBillMapper.java b/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/mapper/HangBillMapper.java index 1b1555a36..50afb0d19 100644 --- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/mapper/HangBillMapper.java +++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/mapper/HangBillMapper.java @@ -34,4 +34,22 @@ public interface HangBillMapper extends BaseMapper { * @return */ public HangBillVo selectHangBillById(@Param("id") int id); + + /** + * 查询当前店铺所有的订单总额 + * @return + */ + double selectAllAmount(@Param("storeId") int storeId); + + /** + * 查询当前店铺归还的账单总额 + * @return + */ + double selectReturnAmount(@Param("storeId") int storeId); + + /** + * 查询当前店铺未归还的账单总额 + * @return + */ + double selectNoReturnAmount(@Param("storeId") int storeId); } diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/mapper/xml/HangBillMapper.xml b/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/mapper/xml/HangBillMapper.xml index 028f25e72..5546a03ac 100644 --- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/mapper/xml/HangBillMapper.xml +++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/mapper/xml/HangBillMapper.xml @@ -51,4 +51,14 @@ hb.store_id = #{storeId} and hb.status!=1 + + + + \ No newline at end of file diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/mapper/xml/OilOrderMapper.xml b/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/mapper/xml/OilOrderMapper.xml index ff74a7d55..192df7fff 100644 --- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/mapper/xml/OilOrderMapper.xml +++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/mapper/xml/OilOrderMapper.xml @@ -438,7 +438,7 @@ diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/service/HangBillService.java b/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/service/HangBillService.java index 10d1745d9..a48e20c28 100644 --- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/service/HangBillService.java +++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/service/HangBillService.java @@ -78,4 +78,28 @@ public interface HangBillService extends IService { * @return */ public int updateHangBills(HangBill hangBill,Double repaidAmount,String status); + + /** + * 查询当前店铺所有的订单总额 + * @return + */ + double selectAllAmount(); + + /** + * 查询当前店铺归还账单的数量 + * @return + */ + int selectCountReturn(); + + /** + * 查询当前店铺归还的账单总额 + * @return + */ + double selectReturnAmount(); + + /** + * 查询当前店铺未归还的账单总额 + * @return + */ + double selectNoReturnAmount(); } diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/service/impl/HangBillServiceImpl.java b/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/service/impl/HangBillServiceImpl.java index 2f4ec1225..81bd89192 100644 --- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/service/impl/HangBillServiceImpl.java +++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/service/impl/HangBillServiceImpl.java @@ -253,6 +253,33 @@ public class HangBillServiceImpl extends ServiceImpl i return row; } + @Override + public double selectAllAmount() { + AccountInfo nowAccountInfo = TokenUtil.getNowAccountInfo(); + return baseMapper.selectAllAmount(nowAccountInfo.getStoreId()); + } + + @Override + public int selectCountReturn() { + AccountInfo nowAccountInfo = TokenUtil.getNowAccountInfo(); + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.eq("store_id",nowAccountInfo.getStoreId()); + queryWrapper.eq("status","1"); + return baseMapper.selectCount(queryWrapper); + } + + @Override + public double selectReturnAmount() { + AccountInfo nowAccountInfo = TokenUtil.getNowAccountInfo(); + return baseMapper.selectReturnAmount(nowAccountInfo.getStoreId()); + } + + @Override + public double selectNoReturnAmount() { + AccountInfo nowAccountInfo = TokenUtil.getNowAccountInfo(); + return baseMapper.selectNoReturnAmount(nowAccountInfo.getStoreId()); + } + /** * 调用支付接口 * @param map diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/userManager/service/impl/LJUserServiceImpl.java b/fuintBackend/fuint-application/src/main/java/com/fuint/business/userManager/service/impl/LJUserServiceImpl.java index a504f1eff..1affc0b1f 100644 --- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/userManager/service/impl/LJUserServiceImpl.java +++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/userManager/service/impl/LJUserServiceImpl.java @@ -399,9 +399,10 @@ public class LJUserServiceImpl extends ServiceImpl impleme certifiedMemberService.insertCertifiedMember(certifiedMember1); } } - + AccountInfo nowAccountInfo = TokenUtil.getNowAccountInfo(); + LJStore store = storeService.selectStoreByStoreId(nowAccountInfo.getStoreId()); // 修改余额会员等级信息 - UserBalance balance = balanceService.selectUserBalanceByStorId(userVo.getId(),userVo.getStoreId()); + UserBalance balance = balanceService.selectUserBalance(userVo.getId(),store.getChainStoreId()); if (!ObjectUtil.isEmpty(balance)){ balance.setGradeId(userVo.getGradeId()); balance.setFixingLevel(userVo.getFixingLevel()); diff --git a/fuintCashierWeb/src/api/cashier/hangbill.js b/fuintCashierWeb/src/api/cashier/hangbill.js index c941330d8..7628192cf 100644 --- a/fuintCashierWeb/src/api/cashier/hangbill.js +++ b/fuintCashierWeb/src/api/cashier/hangbill.js @@ -60,3 +60,35 @@ export function editHangBill(data) { data: data }) } + +// 当前店铺归还账单的数量 +export function hangBillReturnTotal() { + return request({ + url: '/business/hangBill/returnTotal', + method: 'get', + }) +} + +// 当前店铺归还账单的数量 +export function hangBillAllAmount() { + return request({ + url: '/business/hangBill/allAmount', + method: 'get', + }) +} + +// 当前店铺归还账单的数量 +export function hangBillAllReturnAmount() { + return request({ + url: '/business/hangBill/allReturnAmount', + method: 'get', + }) +} + +// 当前店铺归还账单的数量 +export function hangBillAllNoReturnAmount() { + return request({ + url: '/business/hangBill/allNoReturnAmount', + method: 'get', + }) +} diff --git a/fuintCashierWeb/src/views/cashier/NewComponents/credit.vue b/fuintCashierWeb/src/views/cashier/NewComponents/credit.vue index 24479a57c..ba3021a88 100644 --- a/fuintCashierWeb/src/views/cashier/NewComponents/credit.vue +++ b/fuintCashierWeb/src/views/cashier/NewComponents/credit.vue @@ -95,11 +95,26 @@ 统计
-
+
挂账笔数
-
55
+
{{ total }}
+
+
+
挂账总额
+
{{ allAmount }}
+
+
+
归还笔数
+
{{ returnTotal }}
+
+
+
归还总额
+
{{ returnAllAmount }}
+
+
+
未还金额
+
{{ noReturnAllAmount }}
-
@@ -128,13 +143,13 @@ {{ props.row.remark ? props.row.remark:"--" }}
- {{ props.row.amount ? props.row.amount:"--" }} + {{ props.row.amount ? props.row.amount:"0" }} - {{ props.row.repaidAmount ? props.row.repaidAmount:"--" }} + {{ props.row.repaidAmount ? props.row.repaidAmount:"0" }} - {{ props.row.outstandAmount ? props.row.outstandAmount:"--" }} + {{ props.row.outstandAmount ? props.row.outstandAmount:"0" }} @@ -647,8 +662,8 @@ import { addHangBill, batchHangBill, - editHangBill, - hangBillInfo, + editHangBill, hangBillAllAmount, hangBillAllNoReturnAmount, hangBillAllReturnAmount, + hangBillInfo, hangBillReturnTotal, hangBills, listHangBill, queryHangBill @@ -661,6 +676,14 @@ import {listReturnRecord, returnRecordByOrderNo, returnRecordInfo} from "@/api/c name: "credit", data(){ return{ + // 归还账单总数 + returnTotal:0, + // 挂账总额 + allAmount:0, + // 归还总额 + returnAllAmount:0, + // 未归还总额 + noReturnAllAmount:0, // 挂账金额 amount:0, // 未归还金额 @@ -754,60 +777,6 @@ import {listReturnRecord, returnRecordByOrderNo, returnRecordInfo} from "@/api/c status: [ { required: true, message: "请选择挂账单位状态", trigger: "blur" }, ], }, - // labelPosition: 'right', - // formLabelAlign: { - // name: '', - // }, - // tableData: [{ - // date: '2016-05-03', - // name: '王小虎', - // province: '上海', - // city: '普陀区', - // address: '上海市普陀区金沙江路 1518 弄', - // zip: 200333 - // }, { - // date: '2016-05-02', - // name: '王小虎', - // province: '上海', - // city: '普陀区', - // address: '上海市普陀区金沙江路 1518 弄', - // zip: 200333 - // }, { - // date: '2016-05-04', - // name: '王小虎', - // province: '上海', - // city: '普陀区', - // address: '上海市普陀区金沙江路 1518 弄', - // zip: 200333 - // }, { - // date: '2016-05-01', - // name: '王小虎', - // province: '上海', - // city: '普陀区', - // address: '上海市普陀区金沙江路 1518 弄', - // zip: 200333 - // }, { - // date: '2016-05-08', - // name: '王小虎', - // province: '上海', - // city: '普陀区', - // address: '上海市普陀区金沙江路 1518 弄', - // zip: 200333 - // }, { - // date: '2016-05-06', - // name: '王小虎', - // province: '上海', - // city: '普陀区', - // address: '上海市普陀区金沙江路 1518 弄', - // zip: 200333 - // }, { - // date: '2016-05-07', - // name: '王小虎', - // province: '上海', - // city: '普陀区', - // address: '上海市普陀区金沙江路 1518 弄', - // zip: 200333 - // }] } }, created() { @@ -815,6 +784,7 @@ import {listReturnRecord, returnRecordByOrderNo, returnRecordInfo} from "@/api/c this.getUnitList(); this.getPayList(); this.getLists(); + this.getStatistic(); }, directives: { // 注册一个局部的自定义指令 v-focus @@ -830,6 +800,21 @@ import {listReturnRecord, returnRecordByOrderNo, returnRecordInfo} from "@/api/c }, }, methods:{ + // 获取挂账统计信息 + getStatistic(){ + hangBillReturnTotal().then(res => { + this.returnTotal = res.data + }) + hangBillAllAmount().then(res => { + this.allAmount = res.data + }) + hangBillAllReturnAmount().then(res => { + this.returnAllAmount = res.data + }) + hangBillAllNoReturnAmount().then(res => { + this.noReturnAllAmount = res.data + }) + }, getPayMeth(list,val){ let name = ""; if (list!=null && list!=""){ diff --git a/fuintCashierWeb/src/views/cashier/vipComponents/vipList.vue b/fuintCashierWeb/src/views/cashier/vipComponents/vipList.vue index 8acd893e9..4b38789fb 100644 --- a/fuintCashierWeb/src/views/cashier/vipComponents/vipList.vue +++ b/fuintCashierWeb/src/views/cashier/vipComponents/vipList.vue @@ -100,125 +100,75 @@ - -
- 统计 -
-
-
-
会员总数
-
55
+ +
统计
+ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + - + @@ -607,67 +557,13 @@ rules: { name: [ { required: true, message: "会员名称不能为空", trigger: "blur" }, - { min: 2, max: 200, message: '会员名称长度必须介于2 和 100 之间', trigger: 'blur' } + // { min: 2, max: 200, message: '会员名称长度必须介于2 和 100 之间', trigger: 'blur' } ], gradeId: [{ required: true, message: "会员等级", trigger: "blur" }], mobile: [ { required: true, message: "请输入手机号", trigger: "blur" }, ], }, - // labelPosition: 'right', - // formLabelAlign: { - // name: '', - // }, - // tableData: [{ - // date: '2016-05-03', - // name: '王小狼', - // province: '上海', - // city: '普陀区', - // address: '上海市普陀区金沙江路 1518 弄', - // zip: 200333 - // }, { - // date: '2016-05-02', - // name: '王小虎', - // province: '上海', - // city: '普陀区', - // address: '上海市普陀区金沙江路 1518 弄', - // zip: 200333 - // }, { - // date: '2016-05-04', - // name: '王小虎', - // province: '上海', - // city: '普陀区', - // address: '上海市普陀区金沙江路 1518 弄', - // zip: 200333 - // }, { - // date: '2016-05-01', - // name: '王小虎', - // province: '上海', - // city: '普陀区', - // address: '上海市普陀区金沙江路 1518 弄', - // zip: 200333 - // }, { - // date: '2016-05-08', - // name: '王小虎', - // province: '上海', - // city: '普陀区', - // address: '上海市普陀区金沙江路 1518 弄', - // zip: 200333 - // }, { - // date: '2016-05-06', - // name: '王小虎', - // province: '上海', - // city: '普陀区', - // address: '上海市普陀区金沙江路 1518 弄', - // zip: 200333 - // }, { - // date: '2016-05-07', - // name: '王小虎', - // province: '上海', - // city: '普陀区', - // address: '上海市普陀区金沙江路 1518 弄', - // zip: 200333 - // }] } }, created() { @@ -675,6 +571,7 @@ this.getConfig(); this.getUserList(); this.getOfficial(); + this.getStatistic(); }, methods:{ getOfficial(){ @@ -718,8 +615,8 @@ // this.literCard = response.data.literCard; // this.refuelMoney = response.data.refuelMoney; }); - listUserGrade().then( response => { - this.userGradeList = response.data.records + listUserGrade({page:1,pageSize:20}).then( response => { + this.userGradeList = response.data.records; }); ljStoreList().then( response => { this.storeList = response.data @@ -961,6 +858,11 @@ .top-app-sou{ width: 20%; } - + .sta{ + height: 100px; + margin-top: 10px; + background: #f6f8f9; + padding-top: 30px; + } From 399cf05de6c3e2196c3bc9304b96b1dba18c5ed0 Mon Sep 17 00:00:00 2001 From: cun-nan <19819293608@163.com> Date: Sat, 13 Jan 2024 13:13:18 +0800 Subject: [PATCH 5/6] bug --- fuintAdmin/src/views/convenienceStore/goodsFile.vue | 8 ++++---- .../src/views/cashier/orderComponents/order_Oil.vue | 1 + 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/fuintAdmin/src/views/convenienceStore/goodsFile.vue b/fuintAdmin/src/views/convenienceStore/goodsFile.vue index df3751b1f..f04e21e64 100644 --- a/fuintAdmin/src/views/convenienceStore/goodsFile.vue +++ b/fuintAdmin/src/views/convenienceStore/goodsFile.vue @@ -211,21 +211,21 @@ - + - + - + @@ -258,7 +258,7 @@ - + diff --git a/fuintCashierWeb/src/views/cashier/orderComponents/order_Oil.vue b/fuintCashierWeb/src/views/cashier/orderComponents/order_Oil.vue index 7cd0367d1..7a0d4b05b 100644 --- a/fuintCashierWeb/src/views/cashier/orderComponents/order_Oil.vue +++ b/fuintCashierWeb/src/views/cashier/orderComponents/order_Oil.vue @@ -386,6 +386,7 @@ let data = await getUser(id); result = data.data.name + "|" + data.data.mobile } + console.log(result) return result.toString(); }, getVal(list,val){ From 0163084c13a122b7df871da59e1fc16ab98911b4 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: Sat, 13 Jan 2024 13:22:33 +0800 Subject: [PATCH 6/6] =?UTF-8?q?=E4=BF=AE=E6=94=B9bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- fuintAdmin/src/views/oilConfig/oilTank/list.vue | 4 ++-- .../business/order/service/impl/OilOrderServiceImpl.java | 3 +++ fuintCashierWeb/src/views/details/index.vue | 2 +- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/fuintAdmin/src/views/oilConfig/oilTank/list.vue b/fuintAdmin/src/views/oilConfig/oilTank/list.vue index 2b34c9dda..a05009aab 100644 --- a/fuintAdmin/src/views/oilConfig/oilTank/list.vue +++ b/fuintAdmin/src/views/oilConfig/oilTank/list.vue @@ -93,7 +93,7 @@ - + - + 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 4712dd8d6..c480abeb3 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 @@ -959,6 +959,9 @@ public class OilOrderServiceImpl extends ServiceImpl i // 修改油罐容量 Double storedQuantity = oilTank.getStoredQuantity(); + if (ObjectUtil.isEmpty(storedQuantity) || storedQuantity - oilOrder.getOilNum() <=0){ + throw new RuntimeException("油罐容量不足!"); + } oilTank.setStoredQuantity(storedQuantity-oilOrder.getOilNum()); oilTankService.update(oilTank); } diff --git a/fuintCashierWeb/src/views/details/index.vue b/fuintCashierWeb/src/views/details/index.vue index 2f5514fbb..10cddb18f 100644 --- a/fuintCashierWeb/src/views/details/index.vue +++ b/fuintCashierWeb/src/views/details/index.vue @@ -1059,7 +1059,7 @@ export default { // 副卡管理 secondCard(){ this.openSecondCard = true; - this.title = this.form.secondCard+'-副卡账户管理' + this.title = this.form.secondCard || ''+'-副卡账户管理' }, // 实体卡绑定 bindIdCard(){