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

bug

Browse Source
This commit is contained in:
cun-nan 2024-01-12 15:29:24 +08:00
parent 44be8fd893
commit 288de2b8ba
12 changed files with 71 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -145,7 +145,7 @@ public class FyPayServiceImpl implements FyPayService {
ReceiveParameter receiveParameter = new ReceiveParameter();
receiveParameter.setOrderNo(orderNo);
receiveParameter.setGoodsMoney(allAmount*100);
receiveParameter.setGoodsMoney(allAmount/100);
receiveParameter.setStoreId(storeId1);
receiveParameter.setPayType(payType);
@ -381,7 +381,9 @@ public class FyPayServiceImpl implements FyPayService {
receiveParameter.setContent("积分订单");
}
this.insertAllOrderInfo(receiveParameter,payStatus);
if (!reqMap.get("trans_stat").equals("USERPAYING")){
this.insertAllOrderInfo(receiveParameter,payStatus);
}
}
}catch (Exception e){
log.error(e.getMessage());

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

@ -45,7 +45,7 @@ public interface OilOrderMapper extends BaseMapper<OilOrder> {
* @param orderNo
* @return
*/
public List<OilOrderVo> selectOilOrderByOrderNo(@Param("orderNo") String orderNo);
public List<OilOrderVo> selectOilOrderByOrderNo(@Param("orderNo") String orderNo,@Param("storeId") Integer storeId);
public Map<String, String> orderAmountStatistics(@Param("startTime") String startTime,@Param("endTime") String endTime,@Param("storeId") Integer storeId);

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

@ -45,9 +45,10 @@
<select id="selectOilOrderByOrderNo" resultType="com.fuint.business.order.vo.OilOrderVo"
parameterType="string">
select oil.*,onu.oil_price from oil_order oil
inner join oil_number onu on oil.oils = onu.oil_name
left join oil_number onu on oil.oils = onu.oil_name
<where>
oil.order_no like concat(#{orderNo}, '%')
and onu.store_id = #{storeId}
</where>
</select>

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

@ -12,6 +12,7 @@
<include refid="selectReturnRecord"></include>
<where>
rd.hang_bill_id = #{returnRecord.hangBillId}
order by pay_time desc
</where>
</select>
<!-- <select id="selectHangBillById" resultType="com.fuint.business.order.vo.HangBillVo" parameterType="int">-->

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

@ -11,10 +11,12 @@ import com.fuint.api.fuyou.entity.MerchantConfig;
import com.fuint.api.fuyou.service.FyPayService;
import com.fuint.api.fuyou.service.MerchantConfigService;
import com.fuint.api.fuyou.service.OilConfigService;
import com.fuint.business.order.entity.AllOrderInfo;
import com.fuint.business.order.entity.CreditUnit;
import com.fuint.business.order.entity.HangBill;
import com.fuint.business.order.entity.ReturnRecord;
import com.fuint.business.order.mapper.HangBillMapper;
import com.fuint.business.order.service.AllOrderInfoService;
import com.fuint.business.order.service.CreditUnitService;
import com.fuint.business.order.service.HangBillService;
import com.fuint.business.order.service.ReturnRecordService;
@ -209,6 +211,7 @@ public class HangBillServiceImpl extends ServiceImpl<HangBillMapper, HangBill> i
returnRecord.setPayTime(new Date());
Double amount = Double.valueOf(jsonObject.get("repaidAmount").toString());
this.updateHangBill(returnRecord.getHangBillId(), amount);
this.insertAllOrderInfo(orderNo,(Integer) jsonObject.get("storeId"),Double.valueOf(jsonObject.get("repaidAmount").toString()),map.get("payType"),(Integer) jsonObject.get("creditUnitId"),"PC");
}else {
returnRecord.setCollectAmount(Double.valueOf(jsonObject.get("repaidAmount").toString()));
returnRecord.setReturnType("0");
@ -222,6 +225,26 @@ public class HangBillServiceImpl extends ServiceImpl<HangBillMapper, HangBill> i
return orderNo;
}
@Autowired
private AllOrderInfoService allOrderInfoService;
/**
* 添加所有订单信息
*/
private void insertAllOrderInfo(String orderNo,Integer storeId,Double goodsMoney,String payType,Integer userId,String payChannel){
AllOrderInfo allOrderInfo = new AllOrderInfo();
allOrderInfo.setOrderNo(orderNo);
allOrderInfo.setType("7");
allOrderInfo.setStoreId(storeId);
allOrderInfo.setGoodsMoney(goodsMoney);
allOrderInfo.setPayType(payType);
allOrderInfo.setUserId(userId);
allOrderInfo.setPayChannel(payChannel);
allOrderInfo.setStatus("paid");
allOrderInfo.setContent("挂账订单");
allOrderInfoService.insertAllOrderInfo(allOrderInfo);
}
@Override
public int updateHangBills(HangBill hangBill, Double repaidAmount,String status) {
HangBill hangBill1 = this.updateStatus(hangBill, repaidAmount);

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

@ -151,7 +151,8 @@ public class OilOrderServiceImpl extends ServiceImpl<OilOrderMapper, OilOrder> i
@Override
public List<OilOrderVo> queryOilOrderByOrderNo(String orderNo) {
List<OilOrderVo> oilOrderVos = baseMapper.selectOilOrderByOrderNo(orderNo);
AccountInfo nowAccountInfo = TokenUtil.getNowAccountInfo();
List<OilOrderVo> oilOrderVos = baseMapper.selectOilOrderByOrderNo(orderNo,nowAccountInfo.getStoreId());
return oilOrderVos;
}

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

@ -165,8 +165,10 @@ public class LJUserServiceImpl extends ServiceImpl<LJUserMapper, LJUser> impleme
LJUserVo ljUserVo = new LJUserVo();
if (ObjectUtil.isNotEmpty(store)){
ljUserVo = baseMapper.selectUserByMobileAndChantStoreId(mobile,store.getChainStoreId());
if (ObjectUtil.isNotEmpty(ljUserVo)){
ljUserVo.setStoreId(store.getId());
}
}
ljUserVo.setStoreId(store.getId());
return ljUserVo;
}

9
fuintCashierWeb/src/views/cashier/NewComponents/Integral.vue
View File

@ -15,7 +15,7 @@
background-color: rgb(67,119,204)">
<div>
<template>
<img v-if="member.avatar" class="list-avatar" :src="member.avatar">
<img v-if="member.avatar" class="list-avatar" :src="baseUrl + member.avatar">
<img v-else class="list-avatar" src="@/assets/images/avatar.png">
</template>
</div>
@ -218,12 +218,12 @@
title="请选择会员"
:visible.sync="dialogVisibleMember"
:close-on-click-modal="false">
<div class="wrap-wrap">
<div class="wrap-wrap" style="height:700px;overflow-y: scroll;">
<el-table ref="tables" :data="memberList">
<el-table-column label="ID" align="center" prop="id" width="80" />
<el-table-column label="头像" align="center" width="70">
<template slot-scope="scope">
<img v-if="scope.row.avatar" class="list-avatar" :src="scope.row.avatar">
<img v-if="scope.row.avatar" class="list-avatar" :src="baseUrl + scope.row.avatar">
<img v-else class="list-avatar" src="@/assets/images/avatar.png">
</template>
</el-table-column>
@ -408,6 +408,7 @@ import {getUserInfoMobile, getUserVoMobile, getUserVoName} from "@/api/cashier/u
dict: [],
data(){
return{
baseUrl:process.env.VUE_APP_BASE_API,
shoppingCart:[],
giftList:'',
giftCategoryList:'',
@ -573,7 +574,7 @@ import {getUserInfoMobile, getUserVoMobile, getUserVoName} from "@/api/cashier/u
})
}else {
getUserVoName({name:this.userNo}).then( response => {
this.memberList = response.data
this.memberList = response.data.userVo
})
this.dialogVisibleMember = true;
}

2
fuintCashierWeb/src/views/cashier/NewComponents/credit.vue
View File

@ -139,7 +139,7 @@
</el-form>
</template>
</el-table-column>
<el-table-column prop="orderNo" label="单据号" width="200"></el-table-column>
<el-table-column prop="orderNo" label="单据号" width="220"></el-table-column>
<el-table-column label="挂账单位">
<el-table-column prop="unitName" label="单位名称"> </el-table-column>
<el-table-column prop="personCredit" label="挂账人"> </el-table-column>

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

@ -2237,6 +2237,7 @@
chooseStaff(data){
this.staff = data;
this.map.staffId = this.staff.id;
this.dialogVisible = false
},
// 删除商品列表信息
delGoods(index){

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

@ -2,18 +2,6 @@
<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" label-width="68px">
<el-form-item label="交易员工" prop="staffId">
<el-select
@ -28,7 +16,7 @@
</el-select>
</el-form-item>
<el-form-item label="订单号">
<el-input v-model="queryParams.orderNo" placeholder="订单号、官方单号检索"></el-input>
<el-input v-model="queryParams.orderNo" clearable placeholder="订单号、官方单号检索"></el-input>
</el-form-item>
<el-form-item label="交易时间">
<el-date-picker
@ -104,7 +92,7 @@
</el-form>
</template>
</el-table-column>
<el-table-column prop="orderNo" label="订单号" width="180"> </el-table-column>
<el-table-column prop="orderNo" label="订单号" width="220"> </el-table-column>
<el-table-column prop="amount" label="订单金额"> </el-table-column>
<el-table-column
prop="payAmount"
@ -125,7 +113,6 @@
prop="payUser"
label="付款用户">
</el-table-column>
<el-table-column
prop="status"
label="状态">
@ -208,7 +195,7 @@
</el-table-column>
<el-table-column label="油号油枪" align="center" prop="terminal">
<template slot-scope="scope">
<span>{{ getName(oilNameList,scope.row.oils) }}/{{ scope.row.oilGunNum }}号枪</span>
<span>{{ getName(oilNameList,scope.row.oils) }}/{{ scope.row.oilGunNum }}</span>
</template>
</el-table-column>
<el-table-column label="加油升数" align="center" prop="oilNum" >

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

@ -203,6 +203,14 @@
label="付款用户" align="center"
width="120">
</el-table-column>
<el-table-column
prop="payType"
label="付款方式" align="center"
width="120">
<template slot-scope="scope">
<span>{{getType(payList,scope.row.payType)}}</span>
</template>
</el-table-column>
<el-table-column
prop="orderStatus"
label="付款状态" align="center"
@ -228,7 +236,6 @@
<el-table-column label="操作" align="center" class-name="small-padding fixed-width">
<template slot-scope="scope">
<!-- <el-button size="mini" type="text" icon="el-icon-edit" >更多操作</el-button>-->
<el-button style="width: 60px" size="mini"
@click="patchwork(scope.row)"
type="primary" plain round>补打</el-button>
@ -313,6 +320,7 @@
dateRange: [],
// 油品订单列表
oilOrderList:[],
payTypeList:[],
// 查询参数
queryParams: {
page: 1,
@ -336,8 +344,15 @@
this.getStaffList();
this.getOrderStatistics();
this.getList();
this.getPayType();
},
methods:{
getPayType(){
getDicts("payment_type").then(res => {
this.payTypeList = res.data
})
},
// 订单统计
getOrderStatistics() {
orderStatisticsApi().then(res=>{
@ -370,6 +385,15 @@
})
return name;
},
getType(list,val){
let name = "";
list.forEach(item => {
if (item.dictValue == val){
name = item.dictLabel
}
})
return name;
},
// 根据id查询会员信息
async queryUser(id){
let result = "";