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 8355fe9d6..d96c988a3 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 @@ -11,6 +11,7 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; +import java.util.List; import java.util.Map; /** @@ -38,6 +39,12 @@ public class LJGoodsController extends BaseController { return getSuccessResult(list); } + @GetMapping("/queryList") + public ResponseObject queryList(){ + List goods = goodsService.selectGoodsList(); + return getSuccessResult(goods); + } + /** * 根据id查询商品信息 * @param id diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/convenienceSore/service/LJGoodsService.java b/fuintBackend/fuint-application/src/main/java/com/fuint/business/convenienceSore/service/LJGoodsService.java index 7d5fc41cd..d79db80ee 100644 --- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/convenienceSore/service/LJGoodsService.java +++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/convenienceSore/service/LJGoodsService.java @@ -6,6 +6,8 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.IService; import com.fuint.business.convenienceSore.entity.LJGoods; +import java.util.List; + /** * 商品信息 业务层 */ @@ -17,6 +19,12 @@ public interface LJGoodsService extends IService { */ public IPage selectLJGoodsList(Page page, LJGoods goods); + /** + * 查询所有商品列表信息 + * @return + */ + public List selectGoodsList(); + /** * 根据id查询商品信息 * @param id diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/convenienceSore/service/impl/LJGoodsServiceImpl.java b/fuintBackend/fuint-application/src/main/java/com/fuint/business/convenienceSore/service/impl/LJGoodsServiceImpl.java index 45add8f9c..f89419b81 100644 --- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/convenienceSore/service/impl/LJGoodsServiceImpl.java +++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/convenienceSore/service/impl/LJGoodsServiceImpl.java @@ -18,6 +18,7 @@ import com.fuint.common.util.TokenUtil; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; +import java.util.List; import java.util.Random; /** @@ -44,6 +45,17 @@ public class LJGoodsServiceImpl extends ServiceImpl impl return goodsIPage; } + @Override + public List selectGoodsList() { + AccountInfo nowAccountInfo = TokenUtil.getNowAccountInfo(); + Integer storeId = nowAccountInfo.getStoreId(); + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.eq("is_recovery",0); + queryWrapper.eq("store_id",storeId); + List list = baseMapper.selectList(queryWrapper); + return list; + } + /** * 根据id查询商品信息 * @param id diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/member/controller/LJStaffController.java b/fuintBackend/fuint-application/src/main/java/com/fuint/business/member/controller/LJStaffController.java index fd1e7db09..9f81a1a61 100644 --- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/member/controller/LJStaffController.java +++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/member/controller/LJStaffController.java @@ -4,6 +4,8 @@ import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.fuint.business.member.entity.LJStaff; import com.fuint.business.member.service.ILJStaffService; +import com.fuint.common.dto.AccountInfo; +import com.fuint.common.util.TokenUtil; import com.fuint.framework.web.BaseController; import com.fuint.framework.web.ResponseObject; import org.springframework.beans.factory.annotation.Autowired; @@ -56,6 +58,18 @@ public class LJStaffController extends BaseController { return getSuccessResult(staff); } + /** + * 根据登录账户名查询员工信息 + * @return + */ + @GetMapping("/name") + public ResponseObject staff(){ + AccountInfo nowAccountInfo = TokenUtil.getNowAccountInfo(); + Integer staffId = nowAccountInfo.getStaffId(); + LJStaff staff = mtStaffService.selectStaffById(staffId); + return getSuccessResult(staff); + } + /** * 根据id查询员工信息 * @param map 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 new file mode 100644 index 000000000..eacaab253 --- /dev/null +++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/controller/OilOrderController.java @@ -0,0 +1,47 @@ +package com.fuint.business.order.controller; + +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.fuint.business.order.entity.OilOrder; +import com.fuint.business.order.service.OilOrderService; +import com.fuint.framework.web.BaseController; +import com.fuint.framework.web.ResponseObject; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.validation.annotation.Validated; +import org.springframework.web.bind.annotation.*; + +import java.util.Map; + +@RestController +@RequestMapping("/business/oilOrder") +public class OilOrderController extends BaseController { + @Autowired + private OilOrderService orderService; + + /** + * 根据条件分页查询会员信息 + * @param order + * @param pageNo + * @param pageSize + * @return + */ + @GetMapping("/list") + public ResponseObject list(OilOrder order, + @RequestParam(value = "page",defaultValue = "1") Integer pageNo, + @RequestParam(value = "pageSize",defaultValue = "10") Integer pageSize){ + Page page =new Page(pageNo,pageSize); + IPage list = orderService.selectOilOrderList(page,order); + return getSuccessResult(list); + } + + /** + * 批量添加订单信息 + * @param map + * @return + */ + @PostMapping + public ResponseObject add(@Validated @RequestBody Map map){ + int row = orderService.insertOilOrder(map); + return getSuccessResult(row); + } +} diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/entity/LJOrder.java b/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/entity/LJOrder.java index 28c4618f6..fff969131 100644 --- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/entity/LJOrder.java +++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/entity/LJOrder.java @@ -12,11 +12,14 @@ import java.util.Date; import java.io.Serializable; /** - * 订单表(MtOrder)实体类 + * 商品订单表(Order)实体类 + * + * @author makejava + * @since 2023-11-07 15:04:17 */ @Data @TableName("mt_order") -@ApiModel(value = "LJOrder对象", description = "订单表") +@ApiModel(value = "LJOrder对象", description = "商品订单表") public class LJOrder extends BaseEntity implements Serializable { private static final long serialVersionUID = 1L; @@ -26,14 +29,14 @@ public class LJOrder extends BaseEntity implements Serializable { @ApiModelProperty("自增ID") @TableId(value = "ID", type = IdType.AUTO) private Integer id; - /** - * 订单类型 - */ - private String type; /** * 终端 */ private String terminal; + /** + * 订单类型 + */ + private String type; /** * 付款用户 */ @@ -50,14 +53,14 @@ public class LJOrder extends BaseEntity implements Serializable { * 所属店铺ID */ private Integer storeId; + /** + * 商品id + */ + private Integer goodId; /** * 用户ID */ private Integer userId; - /** - * 商品数量 - */ - private Double goodsNum; /** * 订单金额 */ @@ -66,6 +69,10 @@ public class LJOrder extends BaseEntity implements Serializable { * 支付金额 */ private Double payAmount; + /** + * 商品数量 + */ + private Integer goodsNum; /** * 使用积分数量 */ @@ -75,7 +82,7 @@ public class LJOrder extends BaseEntity implements Serializable { */ private Double pointAmount; /** - * 折扣金额 + * 优惠金额 */ private Double discount; /** @@ -94,6 +101,5 @@ public class LJOrder extends BaseEntity implements Serializable { * 操作员工 */ private Integer staffId; - } diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/entity/OilOrder.java b/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/entity/OilOrder.java new file mode 100644 index 000000000..2d2772d2c --- /dev/null +++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/entity/OilOrder.java @@ -0,0 +1,118 @@ +package com.fuint.business.order.entity; + +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import com.fuint.framework.entity.BaseEntity; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.util.Date; +import java.io.Serializable; + +/** + * 油品订单表(OilOrder)实体类 + * + * @author makejava + * @since 2023-11-07 15:10:07 + */ +@Data +@TableName("oil_order") +@ApiModel(value = "OilOrder对象", description = "油品订单表") +public class OilOrder extends BaseEntity implements Serializable { + + private static final long serialVersionUID = 1L; + /** + * 自增ID + */ + @ApiModelProperty("自增ID") + @TableId(value = "ID", type = IdType.AUTO) + private Integer id; + /** + * 店铺id + */ + private Integer storeId; + /** + * 用户id + */ + private Integer userId; + /** + * 优惠券id + */ + private Integer couponId; + /** + * 提成金额 + */ + private Double commissionAmount; + /** + * 员工id + */ + private Integer staffId; + /** + * 终端 + */ + private String terminal; + /** + * 订单号 + */ + private String orderNo; + /** + * 油品 + */ + private String oils; + /** + * 油枪号 + */ + private Integer oilGunNum; + /** + * 油品数量 + */ + private Double oilNum; + /** + * 订单金额 + */ + private Double orderAmount; + /** + * 优惠金额 + */ + private Double discountAmount; + /** + * 实付金额 + */ + private Double payAmount; + /** + * 付款用户 + */ + private String payUser; + /** + * 付款类型：微信、支付宝等、赊账 + */ + private String payType; + /** + * 开票标识：已开票、未开票 + */ + private String invoicing; + /** + * 订单状态：已支付、未支付 + */ + private String orderStatus; + /** + * 支付时间 + */ + private Date payTime; + /** + * 富友订单号 + */ + private Integer reservedFyOrderNo; + /** + * 富友渠道交易流水号 + */ + private Integer reservedTransactionId; + /** + * 订单备注 + */ + private String remark; + +} + diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/mapper/OilOrderMapper.java b/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/mapper/OilOrderMapper.java new file mode 100644 index 000000000..4799995ff --- /dev/null +++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/mapper/OilOrderMapper.java @@ -0,0 +1,20 @@ +package com.fuint.business.order.mapper; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.fuint.business.order.entity.OilOrder; +import org.apache.ibatis.annotations.Param; + +/** + * 油品订单表 Mapper层 + */ +public interface OilOrderMapper extends BaseMapper { + /** + * 根据条件分页查询油品订单信息 + * @param page + * @param order + * @return + */ + public IPage selectOilOrderList(Page page, @Param("order") OilOrder order); +} 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 new file mode 100644 index 000000000..f64cccb2f --- /dev/null +++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/mapper/xml/OilOrderMapper.xml @@ -0,0 +1,35 @@ + + + + + select * from oil_order + + + + \ No newline at end of file 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 new file mode 100644 index 000000000..575c03162 --- /dev/null +++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/service/OilOrderService.java @@ -0,0 +1,28 @@ +package com.fuint.business.order.service; + +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.baomidou.mybatisplus.extension.service.IService; +import com.fuint.business.order.entity.OilOrder; + +import java.util.Map; + +/** + * 油品订单信息 业务层 + */ +public interface OilOrderService extends IService { + /** + * 根据条件分页查询油品订单信息 + * @param page + * @param order + * @return + */ + public IPage selectOilOrderList(Page page, OilOrder order); + + /** + * 添加油品订单信息 + * @param map + * @return + */ + public int insertOilOrder(Map map); +} 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 new file mode 100644 index 000000000..bad28169e --- /dev/null +++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/service/impl/OilOrderServiceImpl.java @@ -0,0 +1,63 @@ +package com.fuint.business.order.service.impl; + +import com.alibaba.fastjson2.JSONArray; +import com.alibaba.fastjson2.JSONObject; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.fuint.business.order.entity.OilOrder; +import com.fuint.business.order.mapper.OilOrderMapper; +import com.fuint.business.order.service.OilOrderService; +import com.fuint.common.dto.AccountInfo; +import com.fuint.common.util.TokenUtil; +import org.springframework.stereotype.Service; + +import java.text.SimpleDateFormat; +import java.util.Date; +import java.util.List; +import java.util.Map; +import java.util.UUID; + +@Service +public class OilOrderServiceImpl extends ServiceImpl implements OilOrderService { + @Override + public IPage selectOilOrderList(Page page, OilOrder order) { + AccountInfo nowAccountInfo = TokenUtil.getNowAccountInfo(); + Integer storeId = nowAccountInfo.getStoreId(); + order.setStoreId(storeId); + IPage oilOrderIPage = baseMapper.selectOilOrderList(page, order); + return oilOrderIPage; + } + + @Override + public int insertOilOrder(Map map) { + String oilOrder = map.get("oilOrder"); + String goodsOrder = map.get("goodsOrder"); + String payType = map.get("payType"); + List jsonObjects = JSONArray.parseArray(oilOrder, JSONObject.class); + OilOrder order = new OilOrder(); + SimpleDateFormat dateFormat = new SimpleDateFormat("yyyyMMddHHmmss"); + String timestamp = dateFormat.format(new Date()); + String randomString = UUID.randomUUID().toString().replace("-","").substring(0,6); +// 添加油品订单信息 + for (JSONObject object : jsonObjects) { + order.setOrderNo(timestamp+randomString); + double amount = (double) object.get("amount"); + double oilPrice = (double) object.get("oilPrice"); + double oilNum = amount/oilPrice; + order.setOilNum(oilNum); + order.setPayType(payType); + order.setOils((String) object.get("oilName")); + order.setOilGunNum((Integer) object.get("oilGunNum")); + order.setOrderAmount((Double) object.get("amount")); + System.out.println(object.get("oilGunNum")); + System.out.println(object.get("numberId")); + System.out.println(object.get("oilName")); + System.out.println(object.get("oilPrice")); + System.out.println(object.get("amount")); + } + +// int row = baseMapper.insert(order); + return 0; + } +} diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/userManager/controller/LJUserController.java b/fuintBackend/fuint-application/src/main/java/com/fuint/business/userManager/controller/LJUserController.java index be6f3e9a7..6c8445a03 100644 --- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/userManager/controller/LJUserController.java +++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/userManager/controller/LJUserController.java @@ -13,6 +13,7 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; +import java.util.List; import java.util.Map; /** @@ -87,6 +88,18 @@ public class LJUserController extends BaseController { return getSuccessResult(userVo); } + /** + * 根据手机号查询会员信息 + * @param map + * @return + */ + @PostMapping("/name") + public ResponseObject userVoByName(@Validated @RequestBody Map map){ + String name = map.get("name"); + List list = userService.queryUserByName(name); + return getSuccessResult(list); + } + /** * 批量删除会员信息 * @return diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/userManager/mapper/LJUserMapper.java b/fuintBackend/fuint-application/src/main/java/com/fuint/business/userManager/mapper/LJUserMapper.java index b7f748c1b..9f1da86a3 100644 --- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/userManager/mapper/LJUserMapper.java +++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/userManager/mapper/LJUserMapper.java @@ -7,6 +7,8 @@ import com.fuint.business.userManager.entity.LJUser; import com.fuint.business.userManager.vo.LJUserVo; import org.apache.ibatis.annotations.Param; +import java.util.List; + /** * 会员信息 mapper层 */ @@ -26,6 +28,13 @@ public interface LJUserMapper extends BaseMapper { */ public LJUserVo selectUserByMobile(@Param("mobile") String mobile); + /** + * 根据会员昵称模糊查询会员信息 + * @param name + * @return + */ + public List selectUserByName(@Param("name") String name); + /** * 统计信息 * @param storeId @@ -33,4 +42,5 @@ public interface LJUserMapper extends BaseMapper { * @return */ public Double selectSumByStore(@Param("storeId") int storeId,@Param("sumValue") String sumValue); + } 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 ae9b52a50..7bc2d2274 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 @@ -51,4 +51,11 @@ mu.mobile = #{mobile} + \ No newline at end of file diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/userManager/service/LJUserService.java b/fuintBackend/fuint-application/src/main/java/com/fuint/business/userManager/service/LJUserService.java index 938fb6f54..f23869e6b 100644 --- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/userManager/service/LJUserService.java +++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/userManager/service/LJUserService.java @@ -47,6 +47,13 @@ public interface LJUserService extends IService { */ public LJUserVo queryUserByMobile(String mobile); + /** + * 根据会员昵称模糊查询会员信息 + * @param name + * @return + */ + public List queryUserByName(String name); + /** * 根据id删除会员信息 * @param id 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 f250cd91e..5d70f7c42 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 @@ -109,6 +109,17 @@ public class LJUserServiceImpl extends ServiceImpl impleme return userVo; } + /** + * 根据会员昵称模糊查询会员信息 + * @param name + * @return + */ + @Override + public List queryUserByName(String name) { + List list = baseMapper.selectUserByName(name); + return list; + } + /** * 根据id删除会员信息 * @param id diff --git a/fuintCashierWeb/src/api/cashier/ljgoods.js b/fuintCashierWeb/src/api/cashier/ljgoods.js index 4d0d97194..1013a970d 100644 --- a/fuintCashierWeb/src/api/cashier/ljgoods.js +++ b/fuintCashierWeb/src/api/cashier/ljgoods.js @@ -9,6 +9,14 @@ export function listLJGoods(query) { }) } +// 查询商品列表 +export function listgoods() { + return request({ + url: '/business/convenience/goods/queryList', + method: 'get', + }) +} + // 查询商品详细 export function getLJGoods(id) { return request({ diff --git a/fuintCashierWeb/src/api/cashier/oilorder.js b/fuintCashierWeb/src/api/cashier/oilorder.js new file mode 100644 index 000000000..5596598fd --- /dev/null +++ b/fuintCashierWeb/src/api/cashier/oilorder.js @@ -0,0 +1,19 @@ +import request from '@/utils/request' + +// 查询油品订单列表 +export function listOilOrder(query) { + return request({ + url: '/business/oilOrder/list', + method: 'get', + params: query + }) +} + +// 新增油品订单信息 +export function addLJGoods(data) { + return request({ + url: '/business/oilOrder', + method: 'post', + data: data + }) +} diff --git a/fuintCashierWeb/src/api/cashier/staff.js b/fuintCashierWeb/src/api/cashier/staff.js index 0b1b01c11..50988682c 100644 --- a/fuintCashierWeb/src/api/cashier/staff.js +++ b/fuintCashierWeb/src/api/cashier/staff.js @@ -25,6 +25,14 @@ export function getStaff(id) { }) } +// 查询当前登录账号信息 +export function staffInfo() { + return request({ + url: '/business/member/staff/name', + method: 'get' + }) +} + // 根据手机号查询员工详情 export function queryStaff(data) { return request({ diff --git a/fuintCashierWeb/src/api/cashier/user.js b/fuintCashierWeb/src/api/cashier/user.js index 8fde919f5..1e17fe70b 100644 --- a/fuintCashierWeb/src/api/cashier/user.js +++ b/fuintCashierWeb/src/api/cashier/user.js @@ -9,24 +9,6 @@ export function listUser(query) { }) } -// 查询会员列表 -export function listStatistic(query) { - return request({ - url: '/business/userManager/user/statistic', - method: 'get', - params: query - }) -} - -// 根据手机号查询会员详细 -export function getUserMobile(data) { - return request({ - url: '/business/userManager/user/mobile' , - method: 'post', - data: data - }) -} - // 根据手机号查询会员详细 export function getUserVoMobile(data) { return request({ @@ -36,4 +18,13 @@ export function getUserVoMobile(data) { }) } +// 根据手机号查询会员详细 +export function getUserVoName(data) { + return request({ + url: '/business/userManager/user/name', + method: 'post', + data: data + }) +} + diff --git a/fuintCashierWeb/src/api/cashier/usergrade.js b/fuintCashierWeb/src/api/cashier/usergrade.js new file mode 100644 index 000000000..7eeae693a --- /dev/null +++ b/fuintCashierWeb/src/api/cashier/usergrade.js @@ -0,0 +1,53 @@ +import request from '@/utils/request' + +// 查询会员等级列表 +export function listUserGrade(query) { + return request({ + url: '/business/userManager/userGrade/list', + method: 'get', + params: query + }) +} + +// 查询会员等级详细 +export function getUserGrade(id) { + return request({ + url: '/business/userManager/userGrade/' + id, + method: 'get' + }) +} + +// 根据会员等级名称查询会员等级信息 +export function queryUserGrade(data) { + return request({ + url: '/business/userManager/userGrade/getName', + method: 'post', + data: data + }) +} + +// 新增会员等级 +export function addUserGrade(data) { + return request({ + url: '/business/userManager/userGrade', + method: 'post', + data: data + }) +} + +// 修改会员等级 +export function updateUserGrade(data) { + return request({ + url: '/business/userManager/userGrade', + method: 'put', + data: data + }) +} + +// 删除会员等级 +export function delUserGrade(id) { + return request({ + url: '/business/userManager/userGrade/' + id, + method: 'delete' + }) +} diff --git a/fuintCashierWeb/src/views/cashier/NewComponents/homeindex.vue b/fuintCashierWeb/src/views/cashier/NewComponents/homeindex.vue index 8c5926af7..b1e5c89ca 100644 --- a/fuintCashierWeb/src/views/cashier/NewComponents/homeindex.vue +++ b/fuintCashierWeb/src/views/cashier/NewComponents/homeindex.vue @@ -3,14 +3,54 @@
-
+
会员登录
+
+
+
+ +
+
+ {{ member.name }}
+ {{ member.mobile }} +
+
+ +
+

会员储值账户余额：{{ member.cardBalance }}

+

积分余额：{{ member.points }}

+
+ + +
+
+ +
+ 会员等级：{{ getGrade(member.gradeId) }} +
+ + +
+
+
+
重置会员
+
+
-
油品:￥200.00
-
商品:￥0.52
-
合计: ￥200.52
+
油品:￥{{ oilAmount }}
+
商品:￥{{ goodsAmount }}
+
合计: ￥{{ oilAmount + goodsAmount }}
满减活动
@@ -19,15 +59,15 @@
扫码支付
-
394.7
+
{{ oilAmount + goodsAmount }}
找零
-
394.7
+
0
-
加油员
-
加油员名称
+
加油员
+
{{ staff.realName }}
@@ -41,10 +81,10 @@
-
￥349.78
+
￥{{ oilAmount + goodsAmount }}
优惠合计：5.74元
-
立即结算
+
立即结算
@@ -94,13 +134,13 @@
-
订单笔数 3件
-
订单金额 ￥2.03
+
订单笔数 {{ oilTotal }}件
+
订单金额 ￥{{ oilAmount }}
-
新增订单
+
新增订单
解锁
@@ -109,16 +149,26 @@
非油商品
- + + + +
-
商品
@@ -128,23 +178,37 @@
操作
-
-
商品名称
+
+
{{ item.name }}
-
0.01
-
-
+
{{ item.retailPrice }}
+
+ +
+
+ + + + + + + + + + +
-
商品数量 3件
-
商品总额 ￥2.03
+
商品数量 {{ goodsTotal }}件
+
商品总额 ￥{{ goodsAmount }}
-
清空
+
清空
取单
挂单
@@ -160,38 +224,30 @@ :close-on-click-modal="false">
-
{{ item.name }}
-
{{ item.mobile }}
+
{{ item.realName }}
+
{{ item.mobile }}
- - - - - - -
- 取 消 + 关 闭 -
付款金额
+
应收金额
- ￥300.00 - - 汽油 - + ￥{{ oilAmount + goodsAmount }} +
+
+ 合计金额：{{ oilAmount + goodsAmount }}元、优惠合计13.02元
-
赠送金额
- @@ -255,7 +313,7 @@ 取 消 - 确 定 + 确 定 @@ -298,7 +356,38 @@ - + + +
+ + + + + + + + + + + + + + +
+
@@ -306,9 +395,11 @@ import {getDicts} from "@/api/dict/data"; import {getOilNameList, getOilNumGun, getOilNumGunById, listOilNumGun} from "@/api/cashier/oilnumgun"; import {fyPay} from "@/api/cashier/pay"; - import {listLJGoods} from "@/api/cashier/ljgoods"; - import {getUserVoMobile} from "@/api/cashier/user"; - import {queryStaffs} from "@/api/cashier/staff"; + import {getLJGoods, listgoods} from "@/api/cashier/ljgoods"; + import {getUserVoMobile, getUserVoName} from "@/api/cashier/user"; + import {queryStaffs, staffInfo} from "@/api/cashier/staff"; + import {addLJGoods} from "@/api/cashier/oilorder"; + import {getUserGrade} from "@/api/cashier/usergrade"; export default { name: "homeindex", @@ -316,8 +407,16 @@ return{ // 油品订单 oilOrder:[], + // 油品金额 + oilAmount:0, // 油品订单数 oilTotal:0, + // 商品订单 + goodsOrder:[], + // 商品金额 + goodsAmount:0, + // 商品订单数 + goodsTotal:0, // 加油金额 rise:[ {value:"￥100"}, @@ -327,6 +426,8 @@ ], // 会员信息 member:{}, + // 会员列表信息 + memberList:[], select1:'会员手机号', // 会员信息 userNo:"", @@ -350,6 +451,7 @@ dialogVisiblej: false, dialogVisiblevip:false, dialogVisibleamount:false, + dialogVisibleMember:false, activeName: '1', tabarr:[ {name:'收银台',icon:'el-icon-s-platform'}, @@ -371,28 +473,146 @@ {color:'#ecfae5'}, {color:'#fafafa'} ], + restaurants:'', num: 1, // 油号名称 oilNameList:'', // 员工列表 staffList:[], + isMember: false, + // 员工信息 + staff:"", + map:{ + // 油品订单 + oilOrder:"", + // 商品订单 + goodsOrder:"", + // 支付方式 + payType:"", + // 油品订单金额 + oilAmount:"", + // 商品订单金额 + goodsAmount:"", + // 油品实付金额 + oilActualPay:"", + // 商品实付金额 + goodsActualPay:"", + // 付款用户 + payUser:"", + // 油品优惠金额 + oilDiscount:"", + // 商品优惠金额 + goodsDiscount:"", + }, + gradeName:"", } }, created() { this.getPayList(); - this.queryGoods(); this.getOilName(); + this.getGoods(); + this.getStaffList(); + this.getStaff(); }, methods:{ + // 重置会员 + resetMember(){ + this.member = {}; + this.isMember = false; + }, + // 获取会员等级信息 + getGrade(id){ + getUserGrade(id).then( response => { + this.gradeName = response.data.name; + }) + return this.gradeName; + }, + // 选择会员 + chooseUser(){ + this.dialogVisiblevip = false + this.isMember = true; + }, + // 选择会员信息 + handleChoose(data){ + this.member = data; + this.dialogVisibleMember = false; + }, + // 清空商品订单列表 + empty(){ + this.goodsOrder = []; + this.goodsTotal = 0; + this.goodsAmount = 0; + }, + // 获取当前账户信息 + getStaff(){ + staffInfo().then( response => { + this.staff = response.data + }) + }, + // 选择员工信息 + chooseStaff(data){ + this.staff = data; + }, + // 删除商品列表信息 + delGoods(index){ + this.goodsOrder.splice(index,1) + }, + // 添加商品列表信息 + changeGoods(val){ + let result = true; + let goods = this.goodsOrder + if (this.goodsOrder.length>0){ + let amount = 0; + for (let i = 0; i { + response.data.num = 1 + this.goodsAmount += response.data.retailPrice + this.goodsOrder.push(response.data); + this.goodsTotal += 1; + }) + } + this.goods = "" + }, + // 立即结算 + settlement(){ + this.dialogVisiblej = true + }, + // 新增订单（重置） + resetting(){ + this.oilOrder = []; + this.oilTotal = 0; + this.oilAmount = 0; + }, + // 获取员工列表 getStaffList(){ queryStaffs().then( response => { this.staffList = response.data }) }, - // 订单信息 + // 油品订单信息 getOilOrder(){ this.dialogVisibleamount = false this.oilOrder.push(this.form) + if (this.select == "元"){ + this.oilAmount = +this.form.amount + this.oilAmount; + }else { + this.oilAmount = +(this.form.oilPrice * this.form.amount) + this.oilAmount; + } this.oilTotal += 1; }, // 选择“元”或“L” @@ -439,48 +659,24 @@ this.oilNameList = response.data; }) }, + // 根据手机号查询会员信息 getUser(){ - getUserVoMobile({mobile:this.userNo}).then( response => { - this.member = response.data - // console.log(this.member) - }) - }, - querySearchAsync(queryString, cb) { - var restaurants = this.goodsList; - // console.log(queryString) - this.goodsList.forEach(item => { - item.indexOf(queryString) - }) - }, - handleSelect(item) { - // console.log(item); - }, - // 查询商品信息 - queryGoods(val){ - // console.log(this.goods) - let map = { - page:1, - pageSize:40, - name:this.goods, - isRecovery:0, + if(this.select1=="会员手机号"){ + getUserVoMobile({mobile:this.userNo}).then( response => { + this.member = response.data + }) + }else { + getUserVoName({name:this.userNo}).then( response => { + this.memberList = response.data + }) + this.dialogVisibleMember = true; } - let map1 = { - page:1, - pageSize:40, - goodsNo:this.goods, - isRecovery:0, - } - listLJGoods(map).then( response => { - if(response.data.records!=null){ - this.goodsList = response.data.records - } + }, + // 查询所有商品信息 + getGoods(){ + listgoods().then( response => { + this.goodsList = response.data }) - listLJGoods(map1).then( response => { - if(response.data.records!=null){ - this.goodsList = response.data.records - } - }) - // console.log(this.goodsList) }, // 加油金额 refuel(id){ @@ -492,17 +688,24 @@ }, // 确定收款 collection(){ - let map = { - authCode : this.authCode, - orderNo : "0000055" - } - // console.log(map) - fyPay(map).then( response => { - // console.log(response) + // JSON.parse() + this.map.oilOrder = JSON.stringify(this.oilOrder); + this.map.goodsOrder = JSON.stringify(this.goodsOrder); + addLJGoods(this.map).then( response => { + console.log(response) }) + // let map = { + // authCode : this.authCode, + // orderNo : "0000055" + // } + // // console.log(map) + // fyPay(map).then( response => { + // // console.log(response) + // }) }, + // 支付方式 payMethod(payType){ - // console.log(payType) + this.map.payType = payType; }, // 获取支付方式 getPayList(){ @@ -526,7 +729,15 @@ .catch(_ => {}); }, handleChange(value) { - // console.log(value); + let goods = this.goodsOrder; + let num = 0; + let amount = 0; + goods.forEach(item => { + num += item.num + amount += item.retailPrice*item.num + }) + this.goodsTotal = num; + this.goodsAmount = amount; }, handleClick(tab, event) { let oilNum = "" @@ -545,7 +756,7 @@ gocomponents(index){ this.leftindex = index }, - } + }, }