dianliang/oil-station
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

收银台

Browse Source
This commit is contained in:
cun-nan 2023-11-10 18:10:23 +08:00
parent 62f5e61959
commit 42b625266d
52 changed files with 2359 additions and 768 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
fuintAdmin/src/views/order/index.vue
View File

@ -14,16 +14,6 @@
</el-option>
</el-select>
</el-form-item>
<!-- <el-form-item label="订单类型" prop="type">-->
<!-- <el-select-->
<!-- v-model="queryParams.type"-->
<!-- clearable-->
<!-- placeholder="全部"-->
<!-- >-->
<!-- <el-option label="交易" value="交易"/>-->
<!-- <el-option label="退款" value="退款"/>-->
<!-- </el-select>-->
<!-- </el-form-item>-->
<el-form-item label="支付类型" prop="payType">
<el-select
v-model="queryParams.payType"
@ -80,7 +70,7 @@
@sort-change="handleSortChange">
<el-table-column label="订单ID" prop="id" width="80"/>
<el-table-column label="终端" align="center" prop="terminal"/>
<el-table-column label="订单号" align="center" prop="orderNo"/>
<el-table-column label="订单号" align="center" prop="orderNo" width="200"/>
<el-table-column label="订单金额" align="center" prop="amount"/>
<el-table-column label="优惠金额" align="center" prop="discount"/>
<el-table-column label="商品数量" align="center" prop="goodsNum">
@ -101,9 +91,9 @@
<span>{{ getRealName(staffList,scope.row.staffId) }}</span>
</template>
</el-table-column>
<el-table-column label="交易时间" align="center" width="150" prop="createTime">
<el-table-column label="交易时间" align="center" width="150" prop="payTime">
<template slot-scope="scope">
<span>{{ parseTime(scope.row.createTime) }}</span>
<span>{{ parseTime(scope.row.payTime) }}</span>
</template>
</el-table-column>
</el-table>
@ -482,3 +472,10 @@ export default {
};
</script>
<style scoped>
.app-container{
width: 100%;
height: 100%;
background: #f6f8f9;
}
</style>

0
fuintBackend/fuint-payment/src/main/java/com/fuint/api/cashier/coltroller/OilNumGunConfigController.java → fuintBackend/fuint-application/src/main/java/com/fuint/api/cashier/coltroller/OilNumGunConfigController.java
View File

0
fuintBackend/fuint-payment/src/main/java/com/fuint/api/cashier/entity/OilNumGunConfig.java → fuintBackend/fuint-application/src/main/java/com/fuint/api/cashier/entity/OilNumGunConfig.java
View File

6
fuintBackend/fuint-payment/src/main/java/com/fuint/api/cashier/mapper/OilNumGunConfigMapper.java → fuintBackend/fuint-application/src/main/java/com/fuint/api/cashier/mapper/OilNumGunConfigMapper.java
View File

@ -14,6 +14,12 @@ public interface OilNumGunConfigMapper extends BaseMapper<OilNumGunConfig> {
*/
public List<OilNumGunConfigVo> selectOilNumGunList();
/**
* 查询油号油枪信息
* @return
*/
public List<OilNumGunConfigVo> selectOilNumGunsList();
/**
* 根据油号查询油枪信息
* @param numberId

3
fuintBackend/fuint-payment/src/main/java/com/fuint/api/cashier/mapper/xml/OilOrdersMapper.xml → fuintBackend/fuint-application/src/main/java/com/fuint/api/cashier/mapper/xml/OilOrdersMapper.xml
View File

@ -25,5 +25,8 @@
ong.id = #{id}
</where>
</select>
<select id="selectOilNumGunsList" resultType="com.fuint.api.cashier.vo.OilNumGunConfigVo">
<include refid="selectOilNumGun"></include>
</select>
</mapper>

0
fuintBackend/fuint-payment/src/main/java/com/fuint/api/cashier/service/OilNumGunConfigService.java → fuintBackend/fuint-application/src/main/java/com/fuint/api/cashier/service/OilNumGunConfigService.java
View File

2
fuintBackend/fuint-payment/src/main/java/com/fuint/api/cashier/service/impl/OilNumGunConfigServiceImpl.java → fuintBackend/fuint-application/src/main/java/com/fuint/api/cashier/service/impl/OilNumGunConfigServiceImpl.java
View File

@ -24,7 +24,7 @@ public class OilNumGunConfigServiceImpl extends ServiceImpl<OilNumGunConfigMappe
public List<OilNumGunConfigVo> selectListByOilNum(String oilNum) {
List<OilNumGunConfigVo> list = null;
if (oilNum.equals("全部")){
list = baseMapper.selectOilNumGunList();
list = baseMapper.selectOilNumGunsList();
}else {
list = baseMapper.selectListByOilNum(oilNum);
}

0
fuintBackend/fuint-payment/src/main/java/com/fuint/api/cashier/vo/OilNumGunConfigVo.java → fuintBackend/fuint-application/src/main/java/com/fuint/api/cashier/vo/OilNumGunConfigVo.java
View File

0
fuintBackend/fuint-payment/src/main/java/com/fuint/api/fuyou/controller/FyPayController.java → fuintBackend/fuint-application/src/main/java/com/fuint/api/fuyou/controller/FyPayController.java
View File

0
fuintBackend/fuint-payment/src/main/java/com/fuint/api/fuyou/entity/Builder.java → fuintBackend/fuint-application/src/main/java/com/fuint/api/fuyou/entity/Builder.java
View File

0
fuintBackend/fuint-payment/src/main/java/com/fuint/api/fuyou/entity/Const.java → fuintBackend/fuint-application/src/main/java/com/fuint/api/fuyou/entity/Const.java
View File

0
fuintBackend/fuint-payment/src/main/java/com/fuint/api/fuyou/entity/MerchantConfig.java → fuintBackend/fuint-application/src/main/java/com/fuint/api/fuyou/entity/MerchantConfig.java
View File

0
fuintBackend/fuint-payment/src/main/java/com/fuint/api/fuyou/entity/Message.java → fuintBackend/fuint-application/src/main/java/com/fuint/api/fuyou/entity/Message.java
View File

0
fuintBackend/fuint-payment/src/main/java/com/fuint/api/fuyou/mapper/MerchantConfigMapper.java → fuintBackend/fuint-application/src/main/java/com/fuint/api/fuyou/mapper/MerchantConfigMapper.java
View File

0
fuintBackend/fuint-payment/src/main/java/com/fuint/api/fuyou/service/FyPayService.java → fuintBackend/fuint-application/src/main/java/com/fuint/api/fuyou/service/FyPayService.java
View File

0
fuintBackend/fuint-payment/src/main/java/com/fuint/api/fuyou/service/MerchantConfigService.java → fuintBackend/fuint-application/src/main/java/com/fuint/api/fuyou/service/MerchantConfigService.java
View File

66
fuintBackend/fuint-payment/src/main/java/com/fuint/api/fuyou/service/impl/FyPayServiceImpl.java → fuintBackend/fuint-application/src/main/java/com/fuint/api/fuyou/service/impl/FyPayServiceImpl.java
View File

@ -7,23 +7,24 @@ import com.fuint.api.fuyou.entity.Const;
import com.fuint.api.fuyou.entity.Message;
import com.fuint.api.fuyou.service.FyPayService;
import com.fuint.api.fuyou.util.Utils;
import com.fuint.api.order.entity.GoodsOrder;
import com.fuint.api.order.entity.OilOrders;
import com.fuint.api.order.service.GoodsOrderService;
import com.fuint.api.order.service.OilOrdersService;
import com.fuint.business.order.entity.LJOrder;
import com.fuint.business.order.entity.OilOrder;
import com.fuint.business.order.service.LJOrderService;
import com.fuint.business.order.service.OilOrderService;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import java.text.SimpleDateFormat;
import java.util.*;
@Service
@Slf4j
public class FyPayServiceImpl implements FyPayService {
@Autowired
private GoodsOrderService goodsOrderService;
private LJOrderService goodsOrderService;
@Autowired
private OilOrdersService oilOrderService;
private OilOrderService oilOrderService;
/**
* 条码支付
@ -61,32 +62,27 @@ public class FyPayServiceImpl implements FyPayService {
Map<String, String> resMap = Utils.xmlStr2Map(rspXml);
String str = resMap.get("sign");
if (Utils.verifySign(resMap, str)){
String resultCode = resMap.get("result_code");
// if (resultCode.equals("000000")){
// return resMap;
// }else {
ThreadUtil.execAsync(() -> {
Timer timer = new Timer();
timer.schedule(new TimerTask() {
@Override
public void run() {
try {
Map<String, String> orderQueryRes = queryOrder(map1);
if(!orderQueryRes.get("msg").equals("unpaid")){
timer.cancel();
}
} catch (Exception e) {
throw new RuntimeException(e);
String resultCode = resMap.get("result_code");
ThreadUtil.execAsync(() -> {
Timer timer = new Timer();
timer.schedule(new TimerTask() {
@Override
public void run() {
try {
Map<String, String> orderQueryRes = queryOrder(map1);
if(!orderQueryRes.get("msg").equals("unpaid")){
timer.cancel();
}
}
//定时器 立即开始 0.5s一次
}, 0, 500);
Thread.currentThread().interrupt();
});
}
return resMap;
// }
// return null;
} catch (Exception e) {
throw new RuntimeException(e);
}
}
//定时器 立即开始 0.5s一次
}, 0, 500);
Thread.currentThread().interrupt();
});
}
return resMap;
}
@ -114,11 +110,15 @@ public class FyPayServiceImpl implements FyPayService {
Map<String, String> reqMap = Utils.xmlStr2Map(rspXml);
String str = reqMap.get("sign");
if (Utils.verifySign(reqMap, str)){
OilOrders oilOrder = oilOrderService.selectOilOrderByOrderNo(orderNo);
GoodsOrder goodsOrder = goodsOrderService.selectGoodsOrder(orderNo);
OilOrder oilOrder = oilOrderService.selectOilOrderByOrderNo(orderNo);
LJOrder goodsOrder = goodsOrderService.selectGoodsOrder(orderNo);
Date date = new Date();
// SimpleDateFormat dateFormat= new SimpleDateFormat("yyyy-MM-dd :hh:mm:ss");
// dateFormat.format(date);
if (reqMap.get("trans_stat").equals("SUCCESS")){
if (!ObjectUtil.isEmpty(oilOrder)){
oilOrder.setOrderStatus("paid");
oilOrder.setPayTime(date);
}
if (!ObjectUtil.isEmpty(goodsOrder)){
goodsOrder.setStatus("paid");

0
fuintBackend/fuint-payment/src/main/java/com/fuint/api/fuyou/service/impl/MerchantConfigServiceImpl.java → fuintBackend/fuint-application/src/main/java/com/fuint/api/fuyou/service/impl/MerchantConfigServiceImpl.java
View File

0
fuintBackend/fuint-payment/src/main/java/com/fuint/api/fuyou/util/Sign.java → fuintBackend/fuint-application/src/main/java/com/fuint/api/fuyou/util/Sign.java
View File

0
fuintBackend/fuint-payment/src/main/java/com/fuint/api/fuyou/util/Utils.java → fuintBackend/fuint-application/src/main/java/com/fuint/api/fuyou/util/Utils.java
View File

43
fuintBackend/fuint-application/src/main/java/com/fuint/business/order/entity/CashierOrder.java Normal file
View File

@ -0,0 +1,43 @@
package com.fuint.business.order.entity;
import lombok.Data;
import java.util.Date;
@Data
public class CashierOrder {
// 油品id
private Integer oilId;
// 商品id
private Integer goodId;
// 订单号
private String orderNo;
// 油品实付金额
private Double oilPayAmount;
// 商品实付金额
private Double goodsPayAmount;
// 油品订单金额
private Double oilOrderAmount;
// 商品订单金额
private Double goodsOrderAmount;
// 油品优惠金额
private Double oilDiscountAmount;
// 商品优惠金额
private Double goodsDiscountAmount;
// 付款用户
private String payUser;
// 付款类型
private String payType;
// 支付时间
private Date payTime;
// 油品金额
private Double orderAmount;
// 油号
private String oils;
// 油枪号
private Integer oilGunNum;
// 油品数量
private Double oilNum;
// 油品单价
private Double oilPrice;
}

4
fuintBackend/fuint-application/src/main/java/com/fuint/business/order/entity/OilOrder.java
View File

@ -97,6 +97,10 @@ public class OilOrder extends BaseEntity implements Serializable {
* 订单状态：已支付、未支付
*/
private String orderStatus;
/**
* 订单类型：主订单、子订单
*/
private String orderType;
/**
* 支付时间
*/

45
fuintBackend/fuint-application/src/main/java/com/fuint/business/order/mapper/xml/OilOrderMapper.xml
View File

@ -9,27 +9,30 @@
<include refid="selectOrders"></include>
<where>
store_id = #{order.storeId}
<!-- <if test="order.staffId != null and order.staffId != ''">-->
<!-- and staff_id = #{order.staffId}-->
<!-- </if>-->
<!-- <if test="order.type != null and order.type != ''">-->
<!-- and type = #{order.type}-->
<!-- </if>-->
<!-- <if test="order.payType != null and order.payType != ''">-->
<!-- and pay_type = #{order.payType}-->
<!-- </if>-->
<!-- <if test="order.orderNo != null and order.orderNo != ''">-->
<!-- and order_no like concat('%', #{order.orderNo}, '%')-->
<!-- </if>-->
<!-- <if test="order.payUser != null and order.payUser != ''">-->
<!-- and pay_user like concat('%', #{order.payUser}, '%')-->
<!-- </if>-->
<!-- <if test="order.params.beginTime != null and order.params.beginTime != ''">&lt;!&ndash; 开始时间检索 &ndash;&gt;-->
<!-- and date_format(create_time,'%y%m%d') &gt;= date_format(#{order.params.beginTime},'%y%m%d')-->
<!-- </if>-->
<!-- <if test="order.params.endTime != null and order.params.endTime != ''">&lt;!&ndash; 结束时间检索 &ndash;&gt;-->
<!-- and date_format(create_time,'%y%m%d') &lt;= date_format(#{order.params.endTime},'%y%m%d')-->
<!-- </if>-->
<if test="order.staffId != null and order.staffId != ''">
and staff_id = #{order.staffId}
</if>
<if test="order.terminal != null and order.terminal != ''">
and terminal = #{order.terminal}
</if>
<if test="order.oilGunNum != null and order.oilGunNum != ''">
and oil_gun_num = #{order.oilGunNum}
</if>
<if test="order.payType != null and order.payType != ''">
and pay_type = #{order.payType}
</if>
<if test="order.orderNo != null and order.orderNo != ''">
and order_no like concat('%', #{order.orderNo}, '%')
</if>
<if test="order.payUser != null and order.payUser != ''">
and pay_user like concat('%', #{order.payUser}, '%')
</if>
<if test="order.params.beginTime != null and order.params.beginTime != ''"><!-- 开始时间检索 -->
and date_format(pay_time,'%y%m%d') &gt;= date_format(#{order.params.beginTime},'%y%m%d')
</if>
<if test="order.params.endTime != null and order.params.endTime != ''"><!-- 结束时间检索 -->
and date_format(pay_time,'%y%m%d') &lt;= date_format(#{order.params.endTime},'%y%m%d')
</if>
</where>
</select>
</mapper>

39
fuintBackend/fuint-application/src/main/java/com/fuint/business/order/service/impl/OilOrderServiceImpl.java
View File

@ -1,5 +1,6 @@
package com.fuint.business.order.service.impl;
import cn.hutool.core.util.ObjectUtil;
import com.alibaba.fastjson2.JSONArray;
import com.alibaba.fastjson2.JSONObject;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
@ -137,10 +138,21 @@ public class OilOrderServiceImpl extends ServiceImpl<OilOrderMapper, OilOrder> i
// 将油品订单的json数据转换为数组
List<JSONObject> jsonObjects = JSONArray.parseArray(oilOrder, JSONObject.class);
OilOrder order = new OilOrder();
for (JSONObject object : jsonObjects) {
Double amount = Double.valueOf(object.get("amount").toString());
Double oilPrice = Double.valueOf(object.get("oilPrice").toString());
for (int i = 0;i < jsonObjects.size();i++) {
Double amount = Double.valueOf(jsonObjects.get(i).get("amount").toString());
Double oilPrice = Double.valueOf(jsonObjects.get(i).get("oilPrice").toString());
Double oilNum = amount/oilPrice;
if (i==0){
order.setOrderType("主订单");
order.setOrderAmount(amount);
order.setPayAmount(oilActualPay);
order.setOrderNo(orderNo);
}else {
order.setOrderType("子订单");
order.setOrderAmount(amount);
order.setPayAmount(0.0);
order.setOrderNo(orderNo+"1");
}
order.setStoreId(storeId);
order.setUserId(userId);
@ -148,17 +160,17 @@ public class OilOrderServiceImpl extends ServiceImpl<OilOrderMapper, OilOrder> i
order.setCommissionAmount(commissionAmount);
order.setStaffId(staffId);
order.setTerminal(terminal);
order.setOrderNo(orderNo);
order.setOils((String) object.get("oilName"));
order.setOilGunNum(Integer.valueOf(object.get("oilGunNum").toString()));
order.setOils((String) jsonObjects.get(i).get("oilName"));
order.setOilGunNum(Integer.valueOf(jsonObjects.get(i).get("oilGunNum").toString()));
order.setOilNum(oilNum);
order.setOrderAmount(oilAmount);
order.setDiscountAmount(oilDiscount);
order.setPayAmount(oilActualPay);
order.setPayUser(payUser);
order.setPayType(payType);
order.setInvoicing("未开票");
order.setOrderStatus(payStatus);
if (payType.equals("CASH")){
order.setPayTime(new Date());
}
baseMapper.insert(order);
oilOrder1 = this.selectOilOrderByOrderNo(orderNo);
}
@ -181,6 +193,9 @@ public class OilOrderServiceImpl extends ServiceImpl<OilOrderMapper, OilOrder> i
ljOrder.setDiscount(goodsDiscount);
ljOrder.setStaffId(staffId);
ljOrder.setStatus(payStatus);
if (payType.equals("CASH")){
ljOrder.setPayTime(new Date());
}
orderService.insertGoodOrder(ljOrder);
// 将油品订单的json数据转换为数组
List<JSONObject> goods = JSONArray.parseArray(goodsOrder, JSONObject.class);
@ -227,8 +242,12 @@ public class OilOrderServiceImpl extends ServiceImpl<OilOrderMapper, OilOrder> i
Map<String,Object> orders = new HashMap<>();
OilOrder oilOrder2 = this.selectOilOrderByOrderNo(orderNo);
LJOrder goodsOrder1 = orderService.selectGoodsOrder(orderNo);
orders.put("oilOrder",oilOrder2);
orders.put("goodsOrder",goodsOrder1);
if (!ObjectUtil.isEmpty(oilOrder2)){
orders.put("oilOrder",oilOrder2);
}
if (!ObjectUtil.isEmpty(goodsOrder1)){
orders.put("goodsOrder",goodsOrder1);
}
return orders;
}

9
fuintBackend/fuint-application/src/main/java/com/fuint/business/userManager/controller/LJUserController.java
View File

@ -43,6 +43,15 @@ public class LJUserController extends BaseController {
return getSuccessResult(list);
}
/**
* 查询所有会员信息
* @return
*/
@GetMapping("/userList")
public ResponseObject userList(){
return getSuccessResult(userService.selectUsersList());
}
/**
* 查询会员统计信息
* @return

3
fuintBackend/fuint-application/src/main/java/com/fuint/business/userManager/entity/LJUser.java
View File

@ -39,6 +39,9 @@ public class LJUser extends BaseEntity implements Serializable {
@ApiModelProperty("会员号")
private String userNo;
@ApiModelProperty("实体卡号")
private String physicalCard;
@ApiModelProperty("头像")
private String avatar;

6
fuintBackend/fuint-application/src/main/java/com/fuint/business/userManager/service/LJUserService.java
View File

@ -20,6 +20,12 @@ public interface LJUserService extends IService<LJUser> {
*/
public IPage<LJUserVo> selectUserList(Page page, LJUserVo user);
/**
* 查询所有会员信息
* @return
*/
public List<LJUser> selectUsersList();
/**
* 查询会员统计信息
* @return

41
fuintBackend/fuint-application/src/main/java/com/fuint/business/userManager/service/impl/LJUserServiceImpl.java
View File

@ -44,6 +44,20 @@ public class LJUserServiceImpl extends ServiceImpl<LJUserMapper, LJUser> impleme
return ljUserIPage;
}
/**
* 查询所有会员信息
* @return
*/
@Override
public List<LJUser> selectUsersList() {
AccountInfo nowAccountInfo = TokenUtil.getNowAccountInfo();
Integer storeId = nowAccountInfo.getStoreId();
QueryWrapper queryWrapper = new QueryWrapper<>();
queryWrapper.eq("store_id",storeId);
List list = baseMapper.selectList(queryWrapper);
return list;
}
/**
* 查询会员统计信息
* @return
@ -145,12 +159,29 @@ public class LJUserServiceImpl extends ServiceImpl<LJUserMapper, LJUser> impleme
return 0;
}
if (user.getUserNo()==null || user.getUserNo().equals("")){
// SimpleDateFormat dateFormat = new SimpleDateFormat("yyyyMMddHHmmss");
// String timestamp = dateFormat.format(new Date());
String randomString = UUID.randomUUID().toString().replace("-","").substring(0,6);
user1.setUserNo(randomString);
Random random = new Random();
StringBuilder sb = new StringBuilder();
for (int i = 0; i < 7; i++) {
sb.append(random.nextInt(10));
}
String digits = sb.toString();
int sum = 0;
for (int i = 0; i < digits.length(); i++) {
int digit = Integer.parseInt(String.valueOf(digits.charAt(i)));
if (i % 2 == 0) {
sum += digit;
} else {
sum += digit * 3;
}
}
int checksum = (10 - (sum % 10)) % 10;
String number = digits + checksum;
user1.setUserNo(number);
}else {
user1.setUserNo(user.getUserNo());
}
user1.setUserNo(user.getUserNo());
user1.setAvatar(user.getAvatar());
user1.setName(user.getName());
user1.setOpenId(user.getOpenId());

3
fuintBackend/fuint-application/src/main/java/com/fuint/business/userManager/vo/LJUserVo.java
View File

@ -17,6 +17,9 @@ public class LJUserVo extends BaseEntity {
@ExcelProperty(value = "会员号")
private String userNo;
// 实体卡号
private String physicalCard;
// 头像
private String avatar;

97
fuintBackend/fuint-payment/src/main/java/com/fuint/api/order/entity/GoodsOrder.java
View File

@ -1,97 +0,0 @@
package com.fuint.api.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.io.Serializable;
import java.util.Date;
/**
* 商品订单表(Order)实体类
*
* @author makejava
* @since 2023-11-07 15:04:17
*/
@Data
@TableName("mt_order")
@ApiModel(value = "LJOrder对象", description = "商品订单表")
public class GoodsOrder extends BaseEntity implements Serializable {
private static final long serialVersionUID = 1L;
/**
* 自增ID
*/
@ApiModelProperty("自增ID")
@TableId(value = "ID", type = IdType.AUTO)
private Integer id;
/**
* 终端
*/
private String terminal;
/**
* 付款用户
*/
private String payUser;
/**
* 支付类型
*/
private String payType;
/**
* 订单号
*/
private String orderNo;
/**
* 所属店铺ID
*/
private Integer storeId;
/**
* 用户ID
*/
private Integer userId;
/**
* 订单金额
*/
private Double amount;
/**
* 支付金额
*/
private Double payAmount;
/**
* 商品数量
*/
private Integer goodsNum;
/**
* 使用积分数量
*/
private Integer usePoint;
/**
* 积分金额
*/
private Double pointAmount;
/**
* 优惠金额
*/
private Double discount;
/**
* 用户备注
*/
private String remark;
/**
* 订单状态
*/
private String status;
/**
* 支付时间
*/
private Date payTime;
/**
* 操作员工
*/
private Integer staffId;
}

118
fuintBackend/fuint-payment/src/main/java/com/fuint/api/order/entity/OilOrders.java
View File

@ -1,118 +0,0 @@
package com.fuint.api.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.io.Serializable;
import java.util.Date;
/**
* 油品订单表(OilOrder)实体类
*
* @author makejava
* @since 2023-11-07 15:10:07
*/
@Data
@TableName("oil_order")
@ApiModel(value = "OilOrder对象", description = "油品订单表")
public class OilOrders 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;
}

11
fuintBackend/fuint-payment/src/main/java/com/fuint/api/order/mapper/GoodsOrderMapper.java
View File

@ -1,11 +0,0 @@
package com.fuint.api.order.mapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.fuint.api.order.entity.GoodsOrder;
/**
* 订单信息 Mapper层
*/
public interface GoodsOrderMapper extends BaseMapper<GoodsOrder> {
}

12
fuintBackend/fuint-payment/src/main/java/com/fuint/api/order/mapper/OilOrdersMapper.java
View File

@ -1,12 +0,0 @@
package com.fuint.api.order.mapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.fuint.api.order.entity.OilOrders;
/**
* 油品订单表 Mapper层
*/
public interface OilOrdersMapper extends BaseMapper<OilOrders> {
}

23
fuintBackend/fuint-payment/src/main/java/com/fuint/api/order/service/GoodsOrderService.java
View File

@ -1,23 +0,0 @@
package com.fuint.api.order.service;
import com.baomidou.mybatisplus.extension.service.IService;
import com.fuint.api.order.entity.GoodsOrder;
/**
* 订单信息 业务层
*/
public interface GoodsOrderService extends IService<GoodsOrder> {
/**
* 根据订单号查询商品订单信息
* @param orderNo
* @return
*/
public GoodsOrder selectGoodsOrder(String orderNo);
/**
* 修改商品订单信息
* @param order
* @return
*/
public int updateGoodOrder(GoodsOrder order);
}

23
fuintBackend/fuint-payment/src/main/java/com/fuint/api/order/service/OilOrdersService.java
View File

@ -1,23 +0,0 @@
package com.fuint.api.order.service;
import com.baomidou.mybatisplus.extension.service.IService;
import com.fuint.api.order.entity.OilOrders;
/**
* 油品订单信息 业务层
*/
public interface OilOrdersService extends IService<OilOrders> {
/**
* 根据订单号查询油品订单信息
* @param orderNo
* @return
*/
public OilOrders selectOilOrderByOrderNo(String orderNo);
/**
* 添加油品订单信息
* @param order
* @return
*/
public int updateOilOrder(OilOrders order);
}

26
fuintBackend/fuint-payment/src/main/java/com/fuint/api/order/service/impl/GoodsOrderServiceImpl.java
View File

@ -1,26 +0,0 @@
package com.fuint.api.order.service.impl;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.fuint.api.order.entity.GoodsOrder;
import com.fuint.api.order.mapper.GoodsOrderMapper;
import com.fuint.api.order.service.GoodsOrderService;
import org.springframework.stereotype.Service;
@Service
public class GoodsOrderServiceImpl extends ServiceImpl<GoodsOrderMapper, GoodsOrder> implements GoodsOrderService {
@Override
public GoodsOrder selectGoodsOrder(String orderNo) {
QueryWrapper queryWrapper = new QueryWrapper<>();
queryWrapper.eq("order_no",orderNo);
GoodsOrder ljOrder = baseMapper.selectOne(queryWrapper);
return ljOrder;
}
@Override
public int updateGoodOrder(GoodsOrder order) {
int row = baseMapper.updateById(order);
return row;
}
}

25
fuintBackend/fuint-payment/src/main/java/com/fuint/api/order/service/impl/OilOrdersServiceImpl.java
View File

@ -1,25 +0,0 @@
package com.fuint.api.order.service.impl;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.fuint.api.order.entity.OilOrders;
import com.fuint.api.order.mapper.OilOrdersMapper;
import com.fuint.api.order.service.OilOrdersService;
import org.springframework.stereotype.Service;
@Service
public class OilOrdersServiceImpl extends ServiceImpl<OilOrdersMapper, OilOrders> implements OilOrdersService {
@Override
public OilOrders selectOilOrderByOrderNo(String orderNo) {
QueryWrapper queryWrapper = new QueryWrapper<>();
queryWrapper.eq("order_no",orderNo);
OilOrders order = baseMapper.selectOne(queryWrapper);
return order;
}
@Override
public int updateOilOrder(OilOrders order) {
int row = baseMapper.updateById(order);
return row;
}
}

18
fuintCashierWeb/src/api/cashier/goodsorder.js Normal file
View File

@ -0,0 +1,18 @@
import request from '@/utils/request'
// 查询商品列表
export function listOrder(query) {
return request({
url: '/business/order/list',
method: 'get',
params: query
})
}
// 根据订单id查询商品订单信息
export function getOrderGoods(orderId) {
return request({
url: '/business/orderGoods/' + orderId,
method: 'get',
})
}

2
fuintCashierWeb/src/api/cashier/oilorder.js
View File

@ -27,7 +27,7 @@ export function oilOrder(data) {
})
}
// 根据订单号查询商品订单信息
// 根据订单号查询油品订单信息
export function goodsOrder(data) {
return request({
url: '/business/order/orderNo',

8
fuintCashierWeb/src/api/cashier/user.js
View File

@ -9,6 +9,14 @@ export function listUser(query) {
})
}
// 查询所有会员列表
export function listUsers() {
return request({
url: '/business/userManager/user/userList',
method: 'get'
})
}
// 根据手机号查询会员详细
export function getUserVoMobile(data) {
return request({

61
fuintCashierWeb/src/api/cashier/user/certifiedmember.js Normal file
View File

@ -0,0 +1,61 @@
import request from '@/utils/request'
// 查询固定等级列表
export function listCertifiedMember(query) {
return request({
url: '/business/userManager/certifiedMember/list',
method: 'get',
params: query
})
}
// 查询固定等级详细
export function getCertifiedMember(id) {
return request({
url: '/business/userManager/certifiedMember/' + id,
method: 'get'
})
}
// 根据会员id查询固定等级详细
export function getCertifiedMemberByUserId(userId) {
return request({
url: '/business/userManager/certifiedMember/userId/' + userId,
method: 'get'
})
}
// 新增固定等级
export function addCertifiedMember(data) {
return request({
url: '/business/userManager/certifiedMember',
method: 'post',
data: data
})
}
// 批量新增固定等级
export function addCertifiedMembers(data) {
return request({
url: '/business/userManager/certifiedMember/members',
method: 'post',
data: data
})
}
// 修改固定等级
export function updateCertifiedMember(data) {
return request({
url: '/business/userManager/certifiedMember',
method: 'put',
data: data
})
}
// 删除固定等级
export function delCertifiedMember(id) {
return request({
url: '/business/userManager/certifiedMember/' + id,
method: 'delete'
})
}

19
fuintCashierWeb/src/api/cashier/user/chainstoreconfig.js Normal file
View File

@ -0,0 +1,19 @@
import request from '@/utils/request'
// 查询会员详细
export function getChainStoreConfig() {
return request({
url: '/business/userManager/chainStoreConfig',
method: 'get'
})
}
// 修改会员
export function updateChainStoreConfig(data) {
return request({
url: '/business/userManager/chainStoreConfig',
method: 'put',
data: data
})
}

53
fuintCashierWeb/src/api/cashier/user/fixinglevel.js Normal file
View File

@ -0,0 +1,53 @@
import request from '@/utils/request'
// 查询固定等级列表
export function listFixingLevel(query) {
return request({
url: '/business/userManager/fixingLevel/list',
method: 'get',
params: query
})
}
// 查询固定等级详细
export function getFixingLevel(id) {
return request({
url: '/business/userManager/fixingLevel/' + id,
method: 'get'
})
}
// 根据固定等级名称查询固定等级信息
export function queryFixingLevel(data) {
return request({
url: '/business/userManager/fixingLevel/getName',
method: 'post',
data: data
})
}
// 新增固定等级
export function addFixingLevel(data) {
return request({
url: '/business/userManager/fixingLevel',
method: 'post',
data: data
})
}
// 修改固定等级
export function updateFixingLevel(data) {
return request({
url: '/business/userManager/fixingLevel',
method: 'put',
data: data
})
}
// 删除固定等级
export function delFixingLevel(id) {
return request({
url: '/business/userManager/fixingLevel/' + id,
method: 'delete'
})
}

26
fuintCashierWeb/src/api/cashier/user/store.js Normal file
View File

@ -0,0 +1,26 @@
import request from '@/utils/request'
// 查询店铺详细
export function ljStoreInfo() {
return request({
url: '/business/storeInformation/store',
method: 'get'
})
}
// 查询店铺详细
export function ljStoreList() {
return request({
url: '/business/storeInformation/store/list',
method: 'get'
})
}
// 修改店铺信息
export function updateStore(data) {
return request({
url: '/business/storeInformation/store',
method: 'put',
data: data
})
}

9
fuintCashierWeb/src/api/cashier/user/sysconfig.js Normal file
View File

@ -0,0 +1,9 @@
import request from '@/utils/request'
// 查询会员详细
export function getSysConfig(key) {
return request({
url: '/sysConfig/getByKey/' + key,
method: 'get'
})
}

78
fuintCashierWeb/src/api/cashier/user/user.js Normal file
View File

@ -0,0 +1,78 @@
import request from '@/utils/request'
// 查询会员列表
export function listUser(query) {
return request({
url: '/business/userManager/user/list',
method: 'get',
params: query
})
}
// 查询会员统计列表
export function listUserStatistic(query) {
return request({
url: '/business/userManager/userStatistic/list',
method: 'get',
params: query
})
}
// 查询会员列表
export function listStatistic(query) {
return request({
url: '/business/userManager/user/statistic',
method: 'get',
params: query
})
}
// 查询会员详细
export function getUser(id) {
return request({
url: '/business/userManager/user/' + id,
method: 'get'
})
}
// 根据手机号查询会员详细
export function getUserMobile(data) {
return request({
url: '/business/userManager/user/mobile' ,
method: 'post',
data: data
})
}
// 新增会员
export function addUser(data) {
return request({
url: '/business/userManager/user',
method: 'post',
data: data
})
}
// 修改会员
export function updateUser(data) {
return request({
url: '/business/userManager/user',
method: 'put',
data: data
})
}
// 删除会员
export function delUser(id) {
return request({
url: '/business/userManager/user/' + id,
method: 'delete'
})
}
//下载示例文件
export function exportUsers() {
return request({
url: '/excel/export',
method: 'get'
})
}

53
fuintCashierWeb/src/api/cashier/user/usergrade.js Normal file
View File

@ -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'
})
}

40
fuintCashierWeb/src/views/cashier/NewComponents/Recharge.vue
View File

@ -3,9 +3,11 @@
<div class="background-bj">
<div class="dispul">
<div class="input-sousuo">
<input type="text" placeholder="会员手机号，会员卡号，会员密码" >
<input type="text" v-model="userNo"
@change="queryUser"
placeholder="会员手机号，会员卡号，会员码" >
</div>
<div class="anniu" >
<div class="anniu" @click="queryUser">
<div>搜索</div>
</div>
</div>
@ -16,22 +18,54 @@
<script>
import details from '../../details/index'
import {listUsers} from "@/api/cashier/user";
export default {
name: "Recharge",
data(){
return{
ph:true,
userNo:"",
userList:[],
userId:"",
}
},
components:{
details
},
created() {
this.queryUserList();
},
methods:{
// 查询用户信息
queryUser(){
let _this = this;
this.userList.forEach(item => {
if (item.mobile == _this.userNo){
_this.userId = item.id
}
if (item.userNo == _this.userNo){
_this.userId = item.id
}
if (item.physicalCard == _this.userNo){
_this.userId = item.id
}
})
if (_this.userId==""){
this.$modal.msgError("会员信息不存在")
}else {
this.govipDetails();
}
},
queryUserList(){
listUsers().then( response => {
this.userList = response.data;
})
},
govipDetails(){
this.$router.push({
path:'/details',
query:{
id:1
id:this.userId
}
})
}

83
fuintCashierWeb/src/views/cashier/NewComponents/homeindex.vue
View File

@ -153,13 +153,20 @@
<div class="center-top-input">
<template>
<el-autocomplete
class="inline-input"
popper-class="my-autocomplete"
style="width: 94%"
v-model="goods"
:fetch-suggestions="querySearch"
placeholder="请输入内容"
:trigger-on-focus="false"
@select="queryGoods"
></el-autocomplete>
placeholder="商品名称，商品关键词，商品条码"
@select="changeGoods">
<template slot-scope="{ item }">
<div style="display: flex;justify-content: space-between">
<span class="name">{{ item.name }}</span>
<span v-if="isMember" class="addr">{{ item.memberPrice }}</span>
<span v-else class="addr">{{ item.retailPrice }}</span>
</div>
</template>
</el-autocomplete>
<!-- <el-select v-model="goods" filterable-->
<!-- style="width: 95%;font-size: 20px;"-->
<!-- @change="changeGoods"-->
@ -493,7 +500,7 @@
<script>
import {getDicts} from "@/api/dict/data";
import {getOilNameList, getOilNumGun, getOilNumGunById, listOilNumGun} from "@/api/cashier/oilnumgun";
import {getLJGoods, listgoods, queryLJGoods} from "@/api/cashier/ljgoods";
import {listgoods} from "@/api/cashier/ljgoods";
import {getUserVoMobile, getUserVoName} from "@/api/cashier/user";
import {queryStaffs, staffInfo} from "@/api/cashier/staff";
import {addLJGoods, goodsOrder, oilOrder} from "@/api/cashier/oilorder";
@ -559,7 +566,7 @@
goods:"",
select:"元",
form:{
amount : ""
amount : 0
},
oilNumGunList:[],
authCode:'',
@ -674,16 +681,19 @@
methods:{
querySearch(queryString, cb) {
let _this = this;
let results = [];
if (queryString == ""){
cb(results);
} else {
queryLJGoods({goodsNo:_this.goods}).then( response => {
results = [];
results.push(response.data)
let results = _this.goodsList;
if (queryString != ""){
results = [];
_this.goodsList.forEach(item => {
if(item.name.includes(queryString)){
results.push(item)
}
if(item.goodsNo.includes(queryString)){
results.push(item)
}
})
cb(results);
}
cb(results);
},
// 取单
pickOrder(){
@ -702,6 +712,7 @@
})
this.goodsTotal = num;
this.goodsAmount = amount;
this.goodsActualPay = this.goodsAmount - this.goodsDiscount;
this.dialogTakeOrder = false;
},
// 作废
@ -722,6 +733,7 @@
this.goodsOrder = [];
this.goodsTotal = 0;
this.goodsAmount = 0;
this.goodsActualPay = this.goodsAmount - this.goodsDiscount;
this.getTakeGoods(this.registrationList[0]);
this.dialogSuccess = true;
},
@ -807,7 +819,7 @@
}else {
amount += goods[i].retailPrice * goods[i].num
}
if (goods[i].id == val){
if (goods[i].id == val.id){
goods[i].num = goods[i].num + 1;
this.goodsTotal += 1;
result = false;
@ -822,27 +834,18 @@
result = true;
}
if (result){
getLJGoods(val).then( response => {
response.data.num = 1;
if (_this.isMember){
this.goodsAmount += response.data.memberPrice
}else {
this.goodsAmount += response.data.retailPrice
}
this.goodsActualPay = this.goodsAmount - this.goodsDiscount;
this.goodsOrder.push(response.data);
this.goodsTotal += 1;
})
val.num = 1;
if (_this.isMember){
this.goodsAmount += val.memberPrice
}else {
this.goodsAmount += val.retailPrice
}
this.goodsActualPay = this.goodsAmount - this.goodsDiscount;
this.goodsOrder.push(val);
this.goodsTotal += 1;
}
this.goods = ""
},
// 回车触发商品搜索
queryGoods(){
let _this = this;
queryLJGoods({goodsNo:_this.goods}).then( response => {
console.log(response)
})
},
// 立即结算
settlement(){
this.isPay = true
@ -908,10 +911,10 @@
changeAmount(amount){
if (this.select == "元"){
this.amount = amount.slice(1)
this.form.amount = amount.slice(1)
this.form.amount = this.amount
}else {
this.amount = amount.slice(0,3)
this.form.amount = amount.slice(0,3)
this.form.amount = this.amount
}
},
// 获取油号名称
@ -959,8 +962,7 @@
},
// 加油金额
refuel(id){
this.amount = ""
this.form.amount = ""
this.amount = 0
this.dialogVisibleamount = true;
getOilNumGunById(id).then( response => {
this.form = response.data;
@ -982,6 +984,7 @@
this.map.allAmount = this.oilActualPay + this.goodsActualPay;
let _this = this;
console.log(this.oilOrder)
addLJGoods(_this.map).then( response => {
if (response.data.oilOrder!=null){
_this.orderNo = response.data.oilOrder.orderNo;
@ -1504,4 +1507,8 @@
height: 50px;
font-size: 18px;
}
.addr{
color: grey;
font-size: 12px;
}
</style>

523
fuintCashierWeb/src/views/cashier/orderComponents/order_Goods.vue
View File

@ -2,18 +2,79 @@
<template>
<div>
<el-card class="box-card">
<div style="display: flex;">
<div class="top-app-sou">
<el-form :label-position="labelPosition" label-width="40px" :model="formLabelAlign">
<el-form-item label="名称">
<el-input v-model="formLabelAlign.name" placeholder="请输入要搜索的内容"></el-input>
</el-form-item>
</el-form>
</div>
<div style="margin-left: 10px">
<el-button type="primary" icon="el-icon-search">搜索</el-button>
</div>
</div>
<el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
<el-form-item label="交易员工" prop="staffId">
<el-select
v-model="queryParams.staffId"
clearable
placeholder="全部"
>
<el-option v-for="item in staffList" :key="item.id" :label="item.realName" :value="item.id">
<span style="float: left">{{ item.realName }}</span>
<span style="float: right; color: #8492a6; font-size: 13px">{{ item.mobile }}</span>
</el-option>
</el-select>
</el-form-item>
<el-form-item label="支付类型" prop="payType">
<el-select
v-model="queryParams.payType"
placeholder="全部"
clearable
style="width: 240px"
>
<el-option
v-for="item in payList"
:key="item.id"
:label="item.dictLabel"
:value="item.dictValue"
/>
</el-select>
</el-form-item>
<el-form-item label="订单号" prop="orderNo">
<el-input
v-model="queryParams.orderNo"
placeholder="请输入订单号"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="手机号" prop="payUser">
<el-input
v-model="queryParams.payUser"
placeholder="请输入会员手机号"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="交易时间">
<el-date-picker
v-model="dateRange"
style="width: 240px"
size="medium"
value-format="yyyy-MM-dd"
type="daterange"
range-separator="-"
start-placeholder="开始日期"
end-placeholder="结束日期"
></el-date-picker>
</el-form-item>
<el-form-item>
<el-button type="primary" icon="el-icon-search" @click="handleQuery">查询</el-button>
<el-button icon="el-icon-refresh" @click="resetQuery">重置</el-button>
</el-form-item>
</el-form>
<!-- <div style="display: flex;">-->
<!-- <div class="top-app-sou">-->
<!-- <el-form :label-position="labelPosition" label-width="40px" :model="formLabelAlign">-->
<!-- <el-form-item label="名称">-->
<!-- <el-input v-model="formLabelAlign.name" placeholder="请输入要搜索的内容"></el-input>-->
<!-- </el-form-item>-->
<!-- </el-form>-->
<!-- </div>-->
<!-- <div style="margin-left: 10px">-->
<!-- <el-button type="primary" icon="el-icon-search">搜索</el-button>-->
<!-- </div>-->
<!-- </div>-->
</el-card>
<el-card class="box-card">
<div slot="header" class="clearfix">
@ -37,7 +98,7 @@
</div>
<div class="table-box">
<el-table
:data="tableData"
:data="list"
style="width: 100%">
<el-table-column type="expand">
<template slot-scope="props">
@ -48,69 +109,35 @@
</el-form>
</template>
</el-table-column>
<el-table-column
prop="date"
label="用户信息"
width="150">
<el-table-column label="订单ID" prop="id" width="80"/>
<el-table-column label="终端" align="center" prop="terminal"/>
<el-table-column label="订单号" align="center" prop="orderNo" width="200"/>
<el-table-column label="订单金额" align="center" prop="amount"/>
<el-table-column label="优惠金额" align="center" prop="discount"/>
<el-table-column label="商品数量" align="center" prop="goodsNum">
<template slot-scope="scope">
<el-tag @click="getGoods(scope.row.id)">{{ scope.row.goodsNum }}</el-tag>
</template>
</el-table-column>
<el-table-column label="余额">
<el-table-column
prop="name"
label="储值卡"
width="120">
</el-table-column>
<el-table-column
prop="name"
label="升值卡"
width="120">
</el-table-column>
<el-table-column label="实付金额" align="center" prop="payAmount"/>
<el-table-column label="付款用户" align="center" prop="payUser"/>
<el-table-column label="付款类型" align="center" prop="payType">
<template slot-scope="scope">
<el-tag v-if="scope.row.status == 'unpaid'">未支付</el-tag>
<el-tag type="success" v-else-if="scope.row.status == 'paid'">已支付</el-tag>
<el-tag type="danger" v-else>支付失败</el-tag>
</template>
</el-table-column>
<el-table-column label="会员等级">
<el-table-column
prop="province"
label="汽油"
width="120">
</el-table-column>
<el-table-column
prop="city"
label="柴油"
width="120">
</el-table-column>
<el-table-column
prop="city"
label="天然气"
width="120">
</el-table-column>
<!-- <el-table-column label="订单类型" align="center" prop="type"/>-->
<el-table-column label="交易员工" align="center" prop="staffId">
<template slot-scope="scope">
<span>{{ getRealName(staffList,scope.row.staffId) }}</span>
</template>
</el-table-column>
<el-table-column label="统计">
<el-table-column
prop="province"
label="加油金"
width="120">
</el-table-column>
<el-table-column
prop="city"
label="积分"
width="120">
</el-table-column>
<el-table-column
prop="city"
label="消费次数"
width="120">
</el-table-column>
</el-table-column>
<el-table-column
prop="zip"
label="实体卡号"
width="220">
</el-table-column>
<el-table-column
prop="zip"
label="状态"
width="120">
<el-table-column label="交易时间" align="center" width="150" prop="payTime">
<template slot-scope="scope">
<span>{{ parseTime(scope.row.payTime) }}</span>
</template>
</el-table-column>
<el-table-column label="操作" align="center" class-name="small-padding fixed-width">
@ -130,137 +157,259 @@
<el-pagination
background
layout="prev, pager, next"
:total="1000">
v-show="total>0"
:total="total"
:page.sync="queryParams.page"
:limit.sync="queryParams.pageSize"
@current-change="getList">
</el-pagination>
</div>
<!-- 商品购买详情 -->
<el-dialog :title="title" :visible.sync="open" width="700px" append-to-body>
<el-table ref="tables" v-loading="loading" :data="goodsList" :default-sort="defaultSort">
<el-table-column label="商品名称" align="center" prop="name"/>
<el-table-column label="商品数量" align="center" prop="num"/>
<el-table-column label="商品单价" align="center" prop="retailPrice"/>
<el-table-column label="会员价" align="center" prop="memberPrice"/>
</el-table>
<div style="height: 20px"></div>
</el-dialog>
</el-card>
</div>
</template>
<script>
export default {
name: "order_Cashier",
data(){
return{
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
}]
}
import {getOrderGoods, listOrder} from "@/api/cashier/goodsorder";
import {queryStaffs} from "@/api/cashier/staff";
import {getDicts} from "@/api/dict/data";
export default {
name: "order_Cashier",
data(){
return{
// 员工列表
staffList:[],
// 日期范围
dateRange: [],
// 遮罩层
loading: true,
// 标题
title: "",
// 选中数组
ids: [],
// 显示搜索条件
showSearch: true,
// 总条数
total: 0,
// 表格数据
list: [],
goodsList:[],
// 是否显示弹出层
open: false,
// 默认排序
defaultSort: {prop: 'createTime', order: 'descending'},
// 查询参数
queryParams: {
page: 1,
pageSize: 10,
},
// 支付列表
payList:[],
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() {
this.getList();
this.getStaffList();
},
methods:{
getPayList(){
getDicts("payment_type").then( response => {
this.payList = response.data;
})
},
// 获取商品详情
getGoods(id){
this.open = true;
this.title = "商品详情"
getOrderGoods(id).then( response => {
this.goodsList = response.data
})
},
// 获取员工姓名
getRealName(list,id){
var name = "";
list.forEach(item => {
if (item.id == id){
name = item.realName;
}
})
return name;
},
// 获取员工列表
getStaffList(){
queryStaffs().then( response => {
this.staffList = response.data;
})
},
// 查询订单
getList(val){
if (val!=undefined){
this.queryParams.page = val
}
this.loading = true;
listOrder(this.addDateRange(this.queryParams, this.dateRange)).then( response => {
this.list = response.data.records;
this.total = response.data.total;
this.loading = false;
})
// const app = this;
// app.loading = true;
// app.queryParams.storeIds = app.storeIds ? app.storeIds.join(",") : '';
// getOrderList(app.queryParams).then( response => {
// this.list = response.data.paginationResponse.content;
// this.total = response.data.paginationResponse.totalElements;
// this.typeList = response.data.typeList;
// this.statusList = response.data.statusList;
// this.payStatusList = response.data.payStatusList;
// this.orderModeList = response.data.orderModeList;
// this.payTypeList = response.data.payTypeList;
// this.storeList = response.data.storeList;
// this.loading = false;
// }
// );
},
// 搜索按钮操作
handleQuery() {
this.queryParams.page = 1;
this.getList();
},
// 重置按钮操作
resetQuery() {
this.dateRange = [];
this.queryParams.status = '';
this.queryParams.mobile = '';
this.queryParams.orderMode = '';
this.queryParams.orderSn = '';
this.queryParams.storeIds = '';
this.storeIds = [];
this.resetForm("queryForm");
this.handleQuery();
},
}
}
</script>
<style scoped>
.app-top{
width: 100%;
.app-top{
width: 100%;
height: 60px;
box-sizing: border-box;
padding: 10px;
}
.clearfix{
width: 100%;
height: 60px;
box-sizing: border-box;
padding: 10px;
}
.clearfix{
width: 100%;
}
.box-card{
width: 100%;
margin-bottom: 15px;
}
.box-gang{
width: 100%;
display: flex;
align-items: center;
}
.box{
width: 200px;
box-sizing: border-box;
padding: 10px;
background: #f9f9f9;
height: 86px;
margin-right: 10px;
}
.size-hui{
font-size: 14px;
margin-bottom: 10px;
margin-top: 10px;
}
.size-bole{
font-weight: bold;
}
.wgang{
width: 100%;
display: flex;
align-items: center;
justify-content: space-between;
margin-bottom: 20px;
}
.box-card{
width: 100%;
margin-bottom: 15px;
}
.box-gang{
width: 100%;
display: flex;
align-items: center;
}
.box{
width: 200px;
box-sizing: border-box;
padding: 10px;
background: #f9f9f9;
height: 86px;
margin-right: 10px;
}
.size-hui{
font-size: 14px;
margin-bottom: 10px;
margin-top: 10px;
}
.size-bole{
font-weight: bold;
}
.wgang{
width: 100%;
display: flex;
align-items: center;
justify-content: space-between;
margin-bottom: 20px;
}
.table-box{
width: 100%;
}
.pagination-box{
width: 100%;
margin: 10px auto;
display: flex;
align-items: center;
justify-content: center;
}
.top-app-sou{
width: 20%;
}
}
.table-box{
width: 100%;
}
.pagination-box{
width: 100%;
margin: 10px auto;
display: flex;
align-items: center;
justify-content: center;
}
.top-app-sou{
width: 20%;
}
</style>

317
fuintCashierWeb/src/views/cashier/orderComponents/order_Oil.vue
View File

@ -3,18 +3,91 @@
<template>
<div>
<el-card class="box-card">
<div style="display: flex;">
<div class="top-app-sou">
<el-form :label-position="labelPosition" label-width="40px" :model="formLabelAlign">
<el-form-item label="名称">
<el-input v-model="formLabelAlign.name" placeholder="请输入要搜索的内容"></el-input>
<!-- <div style="display: flex;">-->
<!-- <div class="top-app-sou">-->
<el-form :model="queryParams" ref="queryForm" size="small" :inline="true" label-width="68px">
<el-form-item label="交易员工" prop="staffId">
<el-select
v-model="queryParams.staffId"
clearable
placeholder="全部"
>
<el-option v-for="item in staffList" :key="item.id" :label="item.realName" :value="item.id">
<span style="float: left">{{ item.realName }}</span>
<span style="float: right; color: #8492a6; font-size: 13px">{{ item.mobile }}</span>
</el-option>
</el-select>
</el-form-item>
<el-form-item label="终端" prop="terminal">
<el-select
v-model="queryParams.terminal"
clearable
placeholder="全部"
>
<el-option v-for="item in terminalList"
:key="item.id"
:label="item.dictLabel"
:value="item.dictValue">
</el-option>
</el-select>
</el-form-item>
<el-form-item label="支付类型" prop="payType">
<el-select
v-model="queryParams.payType"
clearable
placeholder="全部"
>
<el-option v-for="item in payList"
:key="item.id"
:label="item.dictLabel"
:value="item.dictValue">
</el-option>
</el-select>
</el-form-item>
<el-form-item label="手机号">
<el-input v-model="queryParams.payUser" placeholder="请输入手机号"></el-input>
</el-form-item>
<el-form-item label="油枪号" prop="order.oilGunNum">
<el-select
v-model="queryParams.oilGunNum"
filterable
clearable
placeholder="全部"
>
<el-option v-for="item in oilNumList"
:key="item.id"
:label="item.oilGunNum"
:value="item.id">
<span style="float: left">{{ getName(oilNameList,item.oilName) }}</span>
<span style="float: right; color: #8492a6; font-size: 13px">{{ item.oilGunNum }}号枪</span>
</el-option>
</el-select>
</el-form-item>
<el-form-item label="订单号">
<el-input v-model="queryParams.orderNo" placeholder="订单号、官方单号检索"></el-input>
</el-form-item>
<el-form-item label="交易时间">
<el-date-picker
v-model="dateRange"
style="width: 240px"
size="medium"
value-format="yyyy-MM-dd"
type="daterange"
range-separator="-"
start-placeholder="开始日期"
end-placeholder="结束日期"
></el-date-picker>
</el-form-item>
<el-form-item>
<el-button type="primary" icon="el-icon-search" @click="handleQuery">搜索</el-button>
<el-button icon="el-icon-refresh" @click="resetQuery">重置</el-button>
</el-form-item>
</el-form>
</div>
<div style="margin-left: 10px">
<el-button type="primary" icon="el-icon-search">搜索</el-button>
</div>
</div>
<!-- </div>-->
<!-- <div style="margin-left: 10px">-->
<!-- <el-button type="primary" icon="el-icon-search">搜索</el-button>-->
<!-- </div>-->
<!-- </div>-->
</el-card>
<el-card class="box-card">
<div slot="header" class="clearfix">
@ -38,81 +111,85 @@
</div>
<div class="table-box">
<el-table
:data="tableData"
:data="oilOrderList"
style="width: 100%">
<el-table-column type="expand">
<template slot-scope="props">
<el-form label-position="left" inline class="demo-table-expand">
<el-form-item label="名称">
<span>{{ props.row.name }}</span>
<el-form-item label="收银员">
<span>{{ props.row.staffId }}</span>
</el-form-item>
</el-form>
</template>
</el-table-column>
<el-table-column
prop="date"
label="用户信息"
width="150">
prop="terminal"
label="终端"
width="80">
</el-table-column>
<el-table-column label="余额">
<el-table-column
prop="name"
label="储值卡"
width="120">
</el-table-column>
<el-table-column
prop="name"
label="升值卡"
width="120">
</el-table-column>
</el-table-column>
<el-table-column label="会员等级">
<el-table-column
prop="province"
label="汽油"
width="120">
</el-table-column>
<el-table-column
prop="city"
label="柴油"
width="120">
</el-table-column>
<el-table-column
prop="city"
label="天然气"
width="120">
</el-table-column>
</el-table-column>
<el-table-column label="统计">
<el-table-column
prop="province"
label="加油金"
width="120">
</el-table-column>
<el-table-column
prop="city"
label="积分"
width="120">
</el-table-column>
<el-table-column
prop="city"
label="消费次数"
width="120">
</el-table-column>
</el-table-column>
<el-table-column
prop="zip"
label="实体卡号"
prop="orderNo"
label="订单号"
width="180">
</el-table-column>
<el-table-column label="订单信息">
<el-table-column
prop="oilGunNum"
label="油品/油枪"
width="120">
<template slot-scope="props">
<span>{{ getName(oilNameList,props.row.oils) }}/{{ props.row.oilGunNum }}号枪</span>
</template>
</el-table-column>
<el-table-column
prop="orderAmount"
label="订单金额"
width="120">
</el-table-column>
<el-table-column
prop="discountAmount"
label="优惠金额"
width="120">
</el-table-column>
</el-table-column>
<el-table-column label="付款信息">
<el-table-column
prop="payAmount"
label="实付金额"
width="120">
</el-table-column>
<el-table-column
prop="payUser"
label="付款用户"
width="120">
</el-table-column>
<el-table-column
prop="city"
label="orderType"
width="120">
<el-table-column
prop="orderStatus"
label="付款状态"
width="120">
<template slot-scope="scope">
<el-tag v-if="scope.row.orderStatus == 'unpaid'">未支付</el-tag>
<el-tag type="success" v-else-if="scope.row.orderStatus == 'paid'">已支付</el-tag>
<el-tag type="danger" v-else>支付失败</el-tag>
</template>
</el-table-column>
</el-table-column>
<el-table-column
prop="invoicing"
label="开票标识"
width="220">
</el-table-column>
<el-table-column
prop="zip"
label="状态"
width="120">
</el-table-column>
<el-table-column label="注册时间" align="center" width="160" prop="payTime">
<template slot-scope="scope">
<span>{{ parseTime(scope.row.payTime) }}</span>
</template>
</el-table-column>
<el-table-column label="操作" align="center" class-name="small-padding fixed-width">
<template slot-scope="scope">
@ -124,14 +201,18 @@
</template>
</el-table-column>
</el-table-column>
</el-table>
</div>
<div class="pagination-box">
<el-pagination
background
v-show="total>0"
layout="prev, pager, next"
:total="1000">
:total="total"
:page.sync="queryParams.page"
:limit.sync="queryParams.pageSize"
@current-change="getList">
</el-pagination>
</div>
@ -141,14 +222,35 @@
</template>
<script>
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";
export default {
name: "order_Cashier",
data(){
return{
labelPosition: 'right',
formLabelAlign: {
name: '',
// 员工列表
staffList:[],
// 终端列表
terminalList:[],
// 支付类型列表
payList:[],
// 油号列表
oilNameList:[],
// 油枪列表
oilNumList:[],
// 日期范围
dateRange: [],
// 油品订单列表
oilOrderList:[],
// 查询参数
queryParams: {
page: 1,
pageSize: 10,
},
total:0,
tableData: [{
date: '2016-05-03',
name: '王小狼',
@ -200,6 +302,69 @@
zip: 200333
}]
}
},
created() {
this.getStaffList();
this.getList();
},
methods:{
// 获取订单列表信息
getList(val){
if (val!=undefined){
this.queryParams.page = val
}
listOilOrder(this.addDateRange(this.queryParams, this.dateRange)).then( response => {
this.oilOrderList = response.data.records;
this.total = response.data.total;
})
},
// 搜索按钮操作
handleQuery() {
this.queryParams.page = 1;
this.getList();
},
// 重置按钮操作
resetQuery() {
this.dateRange = [];
this.queryParams = {
page: 1,
pageSize: 10,
}
// this.resetForm("queryForm");
this.handleQuery();
},
// 获取列表信息
getStaffList(){
queryStaffs().then( response => {
this.staffList = response.data;
})
getDicts("terminal").then( response => {
this.terminalList = response.data;
})
getDicts("payment_type").then( response => {
this.payList = response.data;
})
getOilNameList().then( response => {
this.oilNameList = response.data;
})
getOilNumGun({oilNum : "全部"}).then( response => {
this.oilNumList = response.data
})
},
// 获取油号名称
getName(oilNameList,id){
let name = ""
let _this = this;
if(oilNameList!=null && oilNameList!=""){
oilNameList.forEach(item => {
if (item.id == id){
name = item.oilName;
_this.oilType = item.oilType;
}
})
}
return name;
},
}
}
</script>

1209
fuintCashierWeb/src/views/details/index.vue
View File

File diff suppressed because it is too large Load Diff