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

收银台打印小票

Browse Source
This commit is contained in:
齐天大圣 2024-10-29 15:29:46 +08:00
parent 9a9ff1dca2
commit 5a5ec7c43c
6 changed files with 24 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
fuintBackend/fuint-application/src/main/java/com/fuint/business/petrolStationManagement/controller/OilSuppliersController.java
View File

@ -80,7 +80,11 @@ public class OilSuppliersController extends BaseController {
sysLog.setContent("新增油站供应商的数据信息");
sysLogService.saveVo(sysLog);
}catch (Exception ignored){}
return getSuccessResult(this.oilSuppliersService.insert(oilSuppliers));
int mm =this.oilSuppliersService.insert(oilSuppliers);
if(mm==1){
return getFailureResult("供应商名称不能重复");
}
return getSuccessResult(mm);
}
/**

8
fuintBackend/fuint-application/src/main/java/com/fuint/business/petrolStationManagement/mapper/OilSuppliersMapper.java
View File

@ -86,6 +86,14 @@ public interface OilSuppliersMapper {
*/
int deleteById(Integer id);
/**
* 通过名字查询油站信息
*
* @param name
* @return
*/
List getSuppliersByName(String name);
}

4
fuintBackend/fuint-application/src/main/java/com/fuint/business/petrolStationManagement/mapper/xml/OilSuppliersMapper.xml
View File

@ -143,6 +143,10 @@
</if>
</where>
</select>
<select id="getSuppliersByName"
resultType="com.fuint.business.petrolStationManagement.entity.OilSuppliers">
select * from oil_suppliers where supplier_name=#{name}
</select>
<!--新增所有列-->
<insert id="insert" keyProperty="id" useGeneratedKeys="true">

2
fuintBackend/fuint-application/src/main/java/com/fuint/business/petrolStationManagement/service/OilSuppliersService.java
View File

@ -40,7 +40,7 @@ public interface OilSuppliersService {
* @param oilSuppliers 实例对象
* @return 实例对象
*/
OilSuppliers insert(OilSuppliers oilSuppliers);
Integer insert(OilSuppliers oilSuppliers);
/**
* 修改数据

8
fuintBackend/fuint-application/src/main/java/com/fuint/business/petrolStationManagement/service/impl/OilSuppliersServiceImpl.java
View File

@ -56,12 +56,16 @@ public class OilSuppliersServiceImpl implements OilSuppliersService {
* @return 实例对象
*/
@Override
public OilSuppliers insert(OilSuppliers oilSuppliers) {
public Integer insert(OilSuppliers oilSuppliers) {
List<OilSuppliers> oilSuppliers1 =this.oilSuppliersDao.getSuppliersByName(oilSuppliers.getSupplierName());
if(oilSuppliers1.size()>0){
return 1;
}
AccountInfo nowAccountInfo = TokenUtil.getNowAccountInfo();
oilSuppliers.setStoreId(nowAccountInfo.getStoreId());
oilSuppliers.setCreateBy(nowAccountInfo.getStaffId().toString());
this.oilSuppliersDao.insert(oilSuppliers);
return oilSuppliers;
return 0;
}
/**

7
fuintCashierWeb/src/views/cashier/orderComponents/order_Cashier.vue
View File

@ -1057,8 +1057,6 @@ export default {
// consumeAmount:this.consumeAmount,
// // 屯油卡付款
// consumeRefuelMoney:this.consumeRefuelMoney.toFixed(2),
},
// 打印商品支付后的订单
@ -1080,13 +1078,10 @@ export default {
}
oilOrderR.push(o)
})
console.log("111111111111111111111111111")
let goodsOrderR = []
if (this.goodsInfo) {
this.goodsInfo.forEach(order => {
console.log("111111111111111111111111111")
let o = {
oilName: order.name,
unit: order.num + "" + order.unit,
@ -1095,8 +1090,6 @@ export default {
goodsOrderR.push(o)
})
}
// 支付方式
const payTypeMap = {
'CASH': '现金',