diff --git a/fuintAdmin/src/views/userGrade/index.vue b/fuintAdmin/src/views/userGrade/index.vue index c9435b376..b39808b1f 100644 --- a/fuintAdmin/src/views/userGrade/index.vue +++ b/fuintAdmin/src/views/userGrade/index.vue @@ -427,61 +427,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
@@ -588,6 +533,9 @@ export default { name: [ { required: true, message: "等级名称不能为空", trigger: "blur" }, ], + growthValue: [ + { required: true, message: "请填写会员升级所需成长值", trigger: "blur" }, + ], gasoline: [ { required: true, message: "请填写汽油成长值", trigger: "blur" }, ], diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/convenienceSore/controller/LJGoodsController.java b/fuintBackend/fuint-application/src/main/java/com/fuint/business/convenienceSore/controller/LJGoodsController.java index d820dd2c9..a76982d68 100644 --- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/convenienceSore/controller/LJGoodsController.java +++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/convenienceSore/controller/LJGoodsController.java @@ -25,7 +25,7 @@ public class LJGoodsController extends BaseController { private LJGoodsService goodsService; /** - * 根据条件查询商品信息 + * 根据条件查询商品信息 传参page、pageSize、商品是否在回收站isRecovery：0不在、1在 * @param goods * @param pageNo * @param pageSize 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 822e9392d..0bbb1fb92 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 @@ -37,6 +37,16 @@ public class OilOrderController extends BaseController { return getSuccessResult(list); } + /** + * 根据id查询油品订单信息 + * @param id + * @return + */ + @GetMapping("/{id}") + public ResponseObject oilOrderInfo(@PathVariable Integer id){ + return getSuccessResult(orderService.selectOilOrderById(id)); + } + /** * 批量添加订单信息 * @param map 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 4d53726a3..d88963f53 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,13 @@ public interface OilOrderService extends IService { */ public OilOrder selectOilOrderByOrderNo(String orderNo); + /** + * 根据id查询油品订单信息 + * @param id + * @return + */ + public OilOrder selectOilOrderById(int id); + /** * 根据订单号模糊查询商品订单信息 * @param orderNo 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 2393172f3..e59662a12 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 @@ -70,6 +70,11 @@ public class OilOrderServiceImpl extends ServiceImpl i return order; } + @Override + public OilOrder selectOilOrderById(int id) { + return baseMapper.selectById(id); + } + @Override public List queryOilOrderByOrderNo(String orderNo) { List oilOrderVos = baseMapper.selectOilOrderByOrderNo(orderNo); @@ -92,6 +97,8 @@ public class OilOrderServiceImpl extends ServiceImpl i String oilOrder = map.get("oilOrder"); // 商品订单信息 String goodsOrder = map.get("goodsOrder"); +// 囤油卡变化之后的信息 + String refuelMoney = map.get("refuelMoney"); // 支付类型 String payType = map.get("payType"); // 油品订单金额 @@ -193,7 +200,7 @@ public class OilOrderServiceImpl extends ServiceImpl i } if (userId!=null){ - this.updateGrowthValue(oilActualPay, userId, Integer.valueOf(jsonObjects.get(i).get("oilName").toString())); + this.updateGrowthValue(oilActualPay, userId, Integer.valueOf(jsonObjects.get(i).get("oilName").toString()),refuelMoney); } order.setStoreId(storeId); order.setUserId(userId); @@ -316,7 +323,7 @@ public class OilOrderServiceImpl extends ServiceImpl i /** * 修改用户成长值信息 */ - private void updateGrowthValue(Double oilActualPay,Integer userid,Integer oilId){ + private void updateGrowthValue(Double oilActualPay,Integer userid,Integer oilId,String refuelMoney){ if (oilId!=null){ OilName oilName = oilNameService.selectOilNameById(oilId); // 获取成长值增长数值 @@ -327,6 +334,7 @@ public class OilOrderServiceImpl extends ServiceImpl i LJUser user = userService.selectUserById(userid); UserBalance balance = userBalanceService.selectUserBalance(userid); int growth = balance.getGrowthValue(); + balance.setRefuelMoney(refuelMoney); // 查询会员等级列表信息 Page page = new Page(1,20); LJUserGrade ljUserGrade1 = new LJUserGrade(); @@ -351,6 +359,7 @@ public class OilOrderServiceImpl extends ServiceImpl i Integer addVal = (int) (dieselGrowthValue * oilActualPay); Integer growthAfter = growth + addVal; // 如果会员成长值达到会员等级成长值，则修改会员的会员等级信息 + System.out.println(records.size()); for (int i = 0; i < records.size(); i++){ if ((growthAfter-records.get(i).getGrowthValue())<100 && (growthAfter-records.get(i).getGrowthValue())>0){ user.setGradeId(records.get(i).getId()); 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 d72bd347d..42eb57145 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 @@ -2,7 +2,7 @@ - select mu.*,mub.card_balance,mub.points from mt_user mu + select mu.*,mub.card_balance,mub.points,mub.growth_value,mub.refuel_money from mt_user mu inner join mt_user_balance mub on mu.id = mub.mt_user_id diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/userManager/vo/LJUserVo.java b/fuintBackend/fuint-application/src/main/java/com/fuint/business/userManager/vo/LJUserVo.java index 633ca3843..f23331771 100644 --- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/userManager/vo/LJUserVo.java +++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/userManager/vo/LJUserVo.java @@ -59,6 +59,7 @@ public class LJUserVo extends BaseEntity { // 成长值 private Integer growthValue; +// 油量 private String refuelMoney; // 出生日期 diff --git a/fuintCashierWeb/src/api/cashier/cardfavorablerecord.js b/fuintCashierWeb/src/api/cashier/cardfavorablerecord.js new file mode 100644 index 000000000..fc4fa9cc7 --- /dev/null +++ b/fuintCashierWeb/src/api/cashier/cardfavorablerecord.js @@ -0,0 +1,10 @@ +import request from '@/utils/request' + +// 查询优惠券信息列表 +export function listCardFavorableRecord(cardValueRecord) { + return request({ + url: '/business/marketingActivity/cardFavorableRecord', + method: 'get', + params: cardValueRecord + }) +} diff --git a/fuintCashierWeb/src/api/cashier/cardvaluerecord.js b/fuintCashierWeb/src/api/cashier/cardvaluerecord.js index 09a953231..ff5e805d9 100644 --- a/fuintCashierWeb/src/api/cashier/cardvaluerecord.js +++ b/fuintCashierWeb/src/api/cashier/cardvaluerecord.js @@ -1,10 +1,18 @@ import request from '@/utils/request' // 查询挂账信息列表 -export function listCardValueRecord(query) { +export function listCardValueRecord(cardValueRecord) { return request({ url: '/business/marketingActivity/cardValueRecord', method: 'get', - params: query + params: cardValueRecord + }) +} + +// 查询挂账信息列表 +export function cardValueRecordInfo(id) { + return request({ + url: '/business/marketingActivity/cardValueRecord/'+id, + method: 'get', }) } diff --git a/fuintCashierWeb/src/api/cashier/cashierorder.js b/fuintCashierWeb/src/api/cashier/cashierorder.js index 35196b9a1..fbcc672d3 100644 --- a/fuintCashierWeb/src/api/cashier/cashierorder.js +++ b/fuintCashierWeb/src/api/cashier/cashierorder.js @@ -1,6 +1,6 @@ import request from '@/utils/request' -// 查询油品订单列表 +// 查询收银台订单列表 export function listCashierOrder(query) { return request({ url: '/business/cashierOrder/list', @@ -9,7 +9,7 @@ export function listCashierOrder(query) { }) } -// 根据id查询油品订单列表 +// 根据id查询收银台订单列表 export function cashierOrder(id) { return request({ url: '/business/cashierOrder/'+id, diff --git a/fuintCashierWeb/src/api/cashier/oilGuns.js b/fuintCashierWeb/src/api/cashier/oilGuns.js new file mode 100644 index 000000000..24c33bb84 --- /dev/null +++ b/fuintCashierWeb/src/api/cashier/oilGuns.js @@ -0,0 +1,43 @@ +import request from "@/utils/request"; + +// 查询油罐列表 +export function getGunApi(data) { + return request({ + url: '/business/petrolStationManagement/oilGun/selectByNumberTGUn', + method: 'get', + params: data + }) +} +// 新增有关信息 +export function insertGunApi(data) { + return request({ + url: 'business/petrolStationManagement/oilGun', + method: 'post', + data: data + }) +} +// 修改有关信息 +export function updateGunApi(data) { + return request({ + url: 'business/petrolStationManagement/oilGun', + method: 'put', + data: data + }) +} +// 根据油号查询油罐 +export function selectTankByNumberApi(data) { + return request({ + url: 'business/petrolStationManagement/oilTank/selectList?numberId='+data, + method: 'get', + params: data + }) +} + +// 查询油罐列表 +export function delGunApi(data) { + return request({ + url: '/business/petrolStationManagement/oilGun/', + method: 'delete', + params: data + }) +} diff --git a/fuintCashierWeb/src/api/cashier/oilorder.js b/fuintCashierWeb/src/api/cashier/oilorder.js index 11e10bfeb..8f4b06997 100644 --- a/fuintCashierWeb/src/api/cashier/oilorder.js +++ b/fuintCashierWeb/src/api/cashier/oilorder.js @@ -9,6 +9,14 @@ export function listOilOrder(query) { }) } +// 根据id查询油品订单信息 +export function oilOrderInfo(id) { + return request({ + url: '/business/oilOrder/'+id, + method: 'get', + }) +} + // 新增油品订单信息 export function addLJGoods(data) { return request({ diff --git a/fuintCashierWeb/src/views/cashier/NewComponents/homeindex.vue b/fuintCashierWeb/src/views/cashier/NewComponents/homeindex.vue index 8a3e0f76f..370edff93 100644 --- a/fuintCashierWeb/src/views/cashier/NewComponents/homeindex.vue +++ b/fuintCashierWeb/src/views/cashier/NewComponents/homeindex.vue @@ -1,5 +1,6 @@ - - - - + + @@ -138,7 +131,6 @@ 退款 - diff --git a/fuintCashierWeb/src/views/cashier/orderComponents/order_Goods.vue b/fuintCashierWeb/src/views/cashier/orderComponents/order_Goods.vue index fe56f6fca..88beb2973 100644 --- a/fuintCashierWeb/src/views/cashier/orderComponents/order_Goods.vue +++ b/fuintCashierWeb/src/views/cashier/orderComponents/order_Goods.vue @@ -91,10 +91,10 @@
商品交易列表
-
+ - 新增会员 -
+ +
油品订单列表
-
+ - 新增会员 -
+ +
- + @@ -220,9 +221,36 @@ @current-change="getList">
- - + + + +
+ ￥{{ oilOrder.payAmount }} +
+
退款金额
+
退款单号：{{ oilOrder.orderNo }}
+
+ 退款原因
+ + + + + +
+
+ +
+ 退款仅支持全额退款,退款金额将按照支付信息原路退回、优惠券、储值卡等原路退回处理 +
+ + 取 消 + 确 定 + +
@@ -230,13 +258,18 @@ import {queryStaffs} from "@/api/cashier/staff"; import {getDicts} from "@/api/dict/data"; import {getOilNameList, getOilNumGun } from "@/api/cashier/oilnumgun"; - import {listOilOrder} from "@/api/cashier/oilorder"; + import {listOilOrder, oilOrderInfo} from "@/api/cashier/oilorder"; import {getUser} from "@/api/cashier/user/user"; export default { name: "order_Cashier", data(){ return{ + oilOrder:{}, + // 退款密码 + password:"", + radio1:"油号选错", + dialogRefund:false, // 员工列表 staffList:[], // 终端列表 @@ -315,6 +348,22 @@ this.getList(); }, methods:{ + // 补打 + patchwork(data){ + const orderNo = data.orderNo + this.$modal.confirm('确定您要补打当前订单吗？当前订单号[' + orderNo + '],请确保云打印机正在运行中').then(function() { + // return delUser(row.id); + }).then(() => { + this.$modal.msgSuccess("打印指令已发送打印机,请查看打印结果"); + }).catch(() => {}); + }, + // 退款 + handleRefund(id){ + this.dialogRefund = true; + oilOrderInfo(id).then( response => { + this.oilOrder = response.data + }) + }, // 根据员工id查询员工信息 queryStaf(list,id){ let name = ""; @@ -462,6 +511,10 @@ .top-app-sou{ width: 20%; } - + .tk{ + text-align: center; + color: grey; + margin: 10px 0; + } diff --git a/fuintCashierWeb/src/views/cashier/orderComponents/order_Ordinary.vue b/fuintCashierWeb/src/views/cashier/orderComponents/order_Ordinary.vue index c6e0f5691..785b9950c 100644 --- a/fuintCashierWeb/src/views/cashier/orderComponents/order_Ordinary.vue +++ b/fuintCashierWeb/src/views/cashier/orderComponents/order_Ordinary.vue @@ -52,10 +52,10 @@
小程序订单列表
-
+ - 新增会员 -
+ +
{ + listCashierOrder(this.addDateRange(this.queryParams, this.dateRange)).then( response => { this.list = response.data.records; this.total = response.data.total; }) @@ -418,6 +418,10 @@ import {queryStaffs} from "@/api/cashier/staff"; .top-app-sou{ width: 20%; } - + .tk{ + text-align: center; + color: grey; + margin: 10px 0; + } diff --git a/fuintCashierWeb/src/views/cashier/orderComponents/order_Unpaid.vue b/fuintCashierWeb/src/views/cashier/orderComponents/order_Unpaid.vue index 9e0775eb2..82e8450b6 100644 --- a/fuintCashierWeb/src/views/cashier/orderComponents/order_Unpaid.vue +++ b/fuintCashierWeb/src/views/cashier/orderComponents/order_Unpaid.vue @@ -27,19 +27,19 @@ - - - - - - + + + + + + + + + + + + + @@ -62,18 +62,18 @@ - - - + + + + + + + + + + + + 搜索 重置 @@ -95,10 +95,10 @@
未支付订单列表
-
+ - 新增会员 -
+ +
- - - + + - - - - - - + + + - + - + - - + - +