From 974fd2be7cda0b6275f2561f0a024d76f7d590af Mon Sep 17 00:00:00 2001 From: cun-nan <19819293608@163.com> Date: Fri, 2 Feb 2024 14:18:16 +0800 Subject: [PATCH] bug --- .../api/staffCommission/staffcommission.js | 9 + .../views/staffCommission/staffCommission.vue | 255 ++++++++++++------ .../fuyou/service/impl/FyPayServiceImpl.java | 6 +- .../CommissionRecordController.java | 17 ++ .../mapper/CommissionRecordMapper.java | 8 + .../mapper/xml/CommissionRecordMapper.xml | 24 ++ .../mapper/xml/StaffCommissionMapper.xml | 7 +- .../service/CommissionRecordService.java | 10 + .../service/StaffCommissionService.java | 5 +- .../impl/CommissionRecordServiceImpl.java | 47 ++++ .../impl/StaffCommissionServiceImpl.java | 102 ++----- .../commission/vo/StaffPercentageVo.java | 25 ++ .../member/mapper/xml/LJStaffMapper.xml | 3 + .../service/impl/OilOrderServiceImpl.java | 12 +- 14 files changed, 353 insertions(+), 177 deletions(-) create mode 100644 fuintBackend/fuint-application/src/main/java/com/fuint/business/commission/vo/StaffPercentageVo.java diff --git a/fuintAdmin/src/api/staffCommission/staffcommission.js b/fuintAdmin/src/api/staffCommission/staffcommission.js index a5a335787..3bed41cc6 100644 --- a/fuintAdmin/src/api/staffCommission/staffcommission.js +++ b/fuintAdmin/src/api/staffCommission/staffcommission.js @@ -70,3 +70,12 @@ export function allAmountCommissionRecord(query) { params: query }) } + +// 查询员工提成记录 +export function listStaffCommissionRecord(query) { + return request({ + url: '/commissionRecord/queryList', + method: 'get', + params: query + }) +} diff --git a/fuintAdmin/src/views/staffCommission/staffCommission.vue b/fuintAdmin/src/views/staffCommission/staffCommission.vue index a5a9e35e9..182002b3e 100644 --- a/fuintAdmin/src/views/staffCommission/staffCommission.vue +++ b/fuintAdmin/src/views/staffCommission/staffCommission.vue @@ -18,22 +18,6 @@ {{ item.mobile }} - - - - - - - - - - - - --> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- + - - + + - + + + + + + + + + + + + + + + - - - - + @@ -131,9 +100,10 @@ :total="total1" :page.sync="queryParams1.page" :limit.sync="queryParams1.pageSize" - @pagination="getCommissionList" + @pagination="getStaffCommissionList" />
+ @@ -236,11 +206,16 @@ - + - + + + + + + @@ -267,12 +242,9 @@ - + {{ dict.label }} - - {{ dict.label }} - @@ -324,6 +296,96 @@ 取 消 + + + +
+ + + + + + + + + + + + + + + + + + + + 搜索 + 重置 + + + + +
+ + + + + + + + + + + + + + + + + + + + +
+ +
+ + @@ -333,7 +395,7 @@ import { addCommission, allAmountCommissionRecord, delCommission, getCommission, - listCommission, listCommissionRecord, + listCommission, listCommissionRecord, listStaffCommissionRecord, queryCommission, updateCommission } from "@/api/staffCommission/staffcommission"; @@ -357,6 +419,7 @@ export default { // 总条数 total: 0, total1: 0, + total2: 0, // 表格数据 list: [], commissionList: [], @@ -377,6 +440,12 @@ export default { page: 1, pageSize: 10, }, + queryParams2: { + page: 1, + pageSize: 10, + }, + // 弹出层 + drawer: false, staffList:[], // 日期范围 dateRange: [], @@ -424,6 +493,14 @@ export default { this.getDuty(); }, methods:{ + getStaffCommissionList(){ + this.loading = true + listStaffCommissionRecord(this.addDateRange(this.queryParams1, this.dateRange)).then(res => { + this.staffCommissionList = res.data.records; + this.total1 = res.data.total; + this.loading = false + }) + }, getStaffDuty(list,ids){ let id = ids.split(",") let name = "" @@ -449,6 +526,10 @@ export default { this.roleList = response.data }) }, + // 是否关闭弹框 + handleClose(done) { + done(); + }, // 点击标签页 handleClick(tab, event) { if (this.activeName == 'oil'){ @@ -476,10 +557,15 @@ export default { page: 1, pageSize: 10, }; - this.getCommissionList(); + this.getStaffCommissionList(); } }, - + // 查看详情 + lookDetail(staffId){ + this.drawer = true + this.queryParams2.staffId = staffId + this.getCommissionList() + }, getCheckbox(){ console.log(this.staffRoleGroup) // this.form.commissionSource = this.commissionSource.toString() @@ -497,16 +583,16 @@ export default { // 查询员工提成记录信息 getCommissionList(){ this.loading = true; - listCommissionRecord(this.addDateRange(this.queryParams1, this.dateRange)).then(res => { + listCommissionRecord(this.addDateRange(this.queryParams2, this.dateRange)).then(res => { this.commissionList = res.data.records; - this.total1 = res.data.total; + this.total2 = res.data.total; this.loading = false; }) - allAmountCommissionRecord(this.addDateRange(this.queryParams1, this.dateRange)).then(res => { - if (res.data){ - this.allAmount = res.data - } - }) + // allAmountCommissionRecord(this.addDateRange(this.queryParams1, this.dateRange)).then(res => { + // if (res.data){ + // this.allAmount = res.data + // } + // }) }, // 表单重置 reset() { @@ -551,6 +637,11 @@ export default { // 搜索按钮操作 handleQuery() { + this.queryParams1.page = 1; + this.getStaffCommissionList(); + }, + // 搜索按钮操作 + handleQuery1() { this.queryParams1.page = 1; this.getCommissionList(); }, @@ -564,6 +655,16 @@ export default { // this.resetForm("queryForm"); this.handleQuery(); }, + // 重置按钮操作 + resetQuery1() { + this.dateRange = []; + this.queryParams2 = { + page: 1, + pageSize: 10, + } + // this.resetForm("queryForm"); + this.handleQuery1(); + }, // 删除按钮操作 handleDelete(row) { const name = row.name diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/api/fuyou/service/impl/FyPayServiceImpl.java b/fuintBackend/fuint-application/src/main/java/com/fuint/api/fuyou/service/impl/FyPayServiceImpl.java index 71c2064c9..ed90ecf64 100644 --- a/fuintBackend/fuint-application/src/main/java/com/fuint/api/fuyou/service/impl/FyPayServiceImpl.java +++ b/fuintBackend/fuint-application/src/main/java/com/fuint/api/fuyou/service/impl/FyPayServiceImpl.java @@ -185,7 +185,7 @@ public class FyPayServiceImpl implements FyPayService { oilOrder.setOrderStatus("paid"); oilOrder.setPayTime(date); oilOrderService.updateCardAndActiveById(oilOrder.getStoreId(),oilOrder.getUserId(),oilOrder.getActiveId(),oilOrder.getCouponId(),oilOrder.getActiveType(),oilOrder.getOrderAmount(), Integer.valueOf(oilOrder.getOils())); - staffCommissionService.countStaffCommission(oilOrder.getStaffId(),oilOrder.getStoreId(),oilOrder.getOrderAmount(),oilOrder.getPayAmount(),oilOrder.getOilNum(),"1",orderNo); + staffCommissionService.countStaffCommission(oilOrder.getStaffId(),oilOrder.getStoreId(),oilOrder.getOrderAmount(),oilOrder.getPayAmount(),"1",orderNo); // 修改油罐容量 List jsonObjects = JSONArray.parseArray(map1.get("oilOrder"), JSONObject.class); if (jsonObjects.size()<=1) { @@ -211,7 +211,7 @@ public class FyPayServiceImpl implements FyPayService { if (goodsOrder.getUserId()!=null){ isMember = true; } - staffCommissionService.countStaffCommission(goodsOrder.getStaffId(),goodsOrder.getStoreId(),goodsOrder.getAmount(),goodsOrder.getPayAmount(),0.0,"2",orderNo); + staffCommissionService.countStaffCommission(goodsOrder.getStaffId(),goodsOrder.getStoreId(),goodsOrder.getAmount(),goodsOrder.getPayAmount(),"2",orderNo); if (!map1.get("goodsOrder").equals("[]")){ List goods = JSONArray.parseArray(map1.get("goodsOrder"), JSONObject.class); OrderGoods orderGoods = new OrderGoods(); @@ -248,7 +248,7 @@ public class FyPayServiceImpl implements FyPayService { } for (OilOrder order : list) { if (order.getOrderType().equals("主订单")){ - staffCommissionService.countStaffCommission(order.getStaffId(),order.getStoreId(),order.getOrderAmount(),order.getPayAmount(),oilLiters,"1",orderNo); + staffCommissionService.countStaffCommission(order.getStaffId(),order.getStoreId(),order.getOrderAmount(),order.getPayAmount(),"1",orderNo); } // 添加多个油品订单 order.setOrderStatus("paid"); diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/commission/controller/CommissionRecordController.java b/fuintBackend/fuint-application/src/main/java/com/fuint/business/commission/controller/CommissionRecordController.java index 8d510e012..38f939252 100644 --- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/commission/controller/CommissionRecordController.java +++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/commission/controller/CommissionRecordController.java @@ -12,6 +12,7 @@ import io.lettuce.core.dynamic.annotation.Param; import javax.annotation.Resource; +import java.util.Map; /** * 提成记录表(CommissionRecord)表控制层 @@ -43,6 +44,22 @@ public class CommissionRecordController extends BaseController { IPage< CommissionRecord> iPageList = this.commissionRecordService.queryByPage(page, commissionRecord); return getSuccessResult(iPageList); } + + /** + * 分页查询 + * + * @param commissionRecord 筛选条件 + * @param pageNo 分页对象 + * @return 查询结果 + */ + @GetMapping("queryList") + public ResponseObject queryStaffCommission(@RequestParam(value = "pageNo",defaultValue = "1") Integer pageNo, + @RequestParam(value = "pageSize",defaultValue = "10") Integer pageSize, + CommissionRecord commissionRecord) { + Page page = new Page(pageNo, pageSize); + Map map = commissionRecordService.selectStaffCommissionList(page, commissionRecord); + return getSuccessResult(map); + } diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/commission/mapper/CommissionRecordMapper.java b/fuintBackend/fuint-application/src/main/java/com/fuint/business/commission/mapper/CommissionRecordMapper.java index b80ffad3a..19c521c26 100644 --- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/commission/mapper/CommissionRecordMapper.java +++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/commission/mapper/CommissionRecordMapper.java @@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.fuint.business.commission.entity.CommissionRecord; import com.fuint.business.commission.vo.CommissionRecordVo; +import com.fuint.business.commission.vo.StaffPercentageVo; import org.apache.ibatis.annotations.Param; import org.springframework.data.domain.Pageable; import java.util.List; @@ -97,5 +98,12 @@ public interface CommissionRecordMapper extends BaseMapper { * @return */ Double selectAllAmount(@Param("commissionRecord") CommissionRecordVo commissionRecord); + + /** + * 根据条件查询员工提成总金额 + * @param commissionRecord + * @return + */ + Double selectAllCommissIon(@Param("commission") CommissionRecord commissionRecord); } diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/commission/mapper/xml/CommissionRecordMapper.xml b/fuintBackend/fuint-application/src/main/java/com/fuint/business/commission/mapper/xml/CommissionRecordMapper.xml index daa529200..0a51bd37a 100644 --- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/commission/mapper/xml/CommissionRecordMapper.xml +++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/commission/mapper/xml/CommissionRecordMapper.xml @@ -233,5 +233,29 @@ + diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/commission/mapper/xml/StaffCommissionMapper.xml b/fuintBackend/fuint-application/src/main/java/com/fuint/business/commission/mapper/xml/StaffCommissionMapper.xml index e733fe7f9..318965cec 100644 --- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/commission/mapper/xml/StaffCommissionMapper.xml +++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/commission/mapper/xml/StaffCommissionMapper.xml @@ -9,7 +9,12 @@ sc.store_id = #{commission.storeId} - and sc.commission_source = #{commission.commissionSource} + + and sc.commission_source != #{commission.commissionSource} and sc.commission_source != '非油品' + + + and sc.commission_source = #{commission.commissionSource} + \ No newline at end of file diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/commission/service/CommissionRecordService.java b/fuintBackend/fuint-application/src/main/java/com/fuint/business/commission/service/CommissionRecordService.java index 947b7e564..47ea6896c 100644 --- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/commission/service/CommissionRecordService.java +++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/commission/service/CommissionRecordService.java @@ -4,8 +4,11 @@ import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.fuint.business.commission.entity.CommissionRecord; import com.fuint.business.commission.vo.CommissionRecordVo; +import com.fuint.business.commission.vo.StaffPercentageVo; import io.lettuce.core.dynamic.annotation.Param; +import java.util.Map; + /** * 提成记录表(CommissionRecord)表服务接口 @@ -32,6 +35,13 @@ public interface CommissionRecordService { */ IPage queryByPage(@Param("page") Page page, CommissionRecord commissionRecord); + /** + * 根据条件分页查询员工提成方案信息 + * @param page + * @return + */ + public Map selectStaffCommissionList(Page page, CommissionRecord commissionRecord); + /** * 新增数据 * diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/commission/service/StaffCommissionService.java b/fuintBackend/fuint-application/src/main/java/com/fuint/business/commission/service/StaffCommissionService.java index 3844fb529..8c65665e0 100644 --- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/commission/service/StaffCommissionService.java +++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/commission/service/StaffCommissionService.java @@ -60,9 +60,8 @@ public interface StaffCommissionService extends IService { * @param storeId 店铺id * @param amount 订单金额 * @param payAmount 实付金额 - * @param oilLiters 油品消费升数 - * @param type 订单类型（1.油品、2.非油品、3.储值卡、4.囤油卡、5.礼品卡、6.加油） + * @param type 订单类型（1.车主加油、2.非油品、3.储值卡充值、4.囤油卡充值） * @param orderNo 关联订单号 */ - void countStaffCommission(Integer staffId,Integer storeId,Double amount,Double payAmount,Double oilLiters,String type,String orderNo); + void countStaffCommission(Integer staffId,Integer storeId,Double amount,Double payAmount,String type,String orderNo); } diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/commission/service/impl/CommissionRecordServiceImpl.java b/fuintBackend/fuint-application/src/main/java/com/fuint/business/commission/service/impl/CommissionRecordServiceImpl.java index 51cb0c244..de1b355d6 100644 --- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/commission/service/impl/CommissionRecordServiceImpl.java +++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/commission/service/impl/CommissionRecordServiceImpl.java @@ -8,6 +8,10 @@ import com.fuint.business.commission.entity.CommissionRecord; import com.fuint.business.commission.mapper.CommissionRecordMapper; import com.fuint.business.commission.service.CommissionRecordService; import com.fuint.business.commission.vo.CommissionRecordVo; +import com.fuint.business.commission.vo.StaffPercentageVo; +import com.fuint.business.member.entity.LJStaff; +import com.fuint.business.member.service.ILJStaffService; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import com.fuint.common.util.TokenUtil; import io.lettuce.core.dynamic.annotation.Param; @@ -16,6 +20,10 @@ import com.fuint.common.dto.AccountInfo; import javax.annotation.Resource; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.Map; /** * 提成记录表(CommissionRecord)表服务实现类 @@ -27,6 +35,8 @@ import javax.annotation.Resource; public class CommissionRecordServiceImpl implements CommissionRecordService { @Resource private CommissionRecordMapper commissionRecordMapper; + @Autowired + private ILJStaffService staffService; /** * 通过ID查询单条数据 @@ -53,6 +63,43 @@ public class CommissionRecordServiceImpl implements CommissionRecordService { return this.commissionRecordMapper.queryAllByLimit(page, commissionRecord); } + @Override + public Map selectStaffCommissionList(Page page, CommissionRecord commissionRecord) { + Map resMap = new HashMap<>(); + AccountInfo nowAccountInfo = TokenUtil.getNowAccountInfo(); + LJStaff staff = new LJStaff(); + staff.setStoreId(nowAccountInfo.getStoreId()); + staff.setId(commissionRecord.getStaffId()); + IPage ljStaffIPage = staffService.selectStaffList(page, staff); + if (ObjectUtil.isNotEmpty(ljStaffIPage)){ + List list = new ArrayList<>(); + for (LJStaff record : ljStaffIPage.getRecords()) { + StaffPercentageVo staffPercentageVo = new StaffPercentageVo(); + staffPercentageVo.setStoreId(nowAccountInfo.getStoreId()); + staffPercentageVo.setStaffName(record.getRealName()); + staffPercentageVo.setStaffMobile(record.getMobile()); + staffPercentageVo.setStaffId(record.getId()); + commissionRecord.setStoreId(nowAccountInfo.getStoreId()); + commissionRecord.setStaffId(record.getId()); + commissionRecord.setType(""); + staffPercentageVo.setSummary(commissionRecordMapper.selectAllCommissIon(commissionRecord)); + commissionRecord.setType("1"); + staffPercentageVo.setOilSale(commissionRecordMapper.selectAllCommissIon(commissionRecord)); + commissionRecord.setType("2"); + staffPercentageVo.setGoodsCommission(commissionRecordMapper.selectAllCommissIon(commissionRecord)); + commissionRecord.setType("3"); + staffPercentageVo.setOilCardRecharge(commissionRecordMapper.selectAllCommissIon(commissionRecord)); + commissionRecord.setType("6"); + staffPercentageVo.setOilStorageRecharge(commissionRecordMapper.selectAllCommissIon(commissionRecord)); + list.add(staffPercentageVo); + } + resMap.put("records",list); + resMap.put("total",ljStaffIPage.getTotal()); + } + + return resMap; + } + /** * 新增数据 * diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/commission/service/impl/StaffCommissionServiceImpl.java b/fuintBackend/fuint-application/src/main/java/com/fuint/business/commission/service/impl/StaffCommissionServiceImpl.java index c2abefe45..98738d162 100644 --- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/commission/service/impl/StaffCommissionServiceImpl.java +++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/commission/service/impl/StaffCommissionServiceImpl.java @@ -115,7 +115,7 @@ public class StaffCommissionServiceImpl extends ServiceImpl(); queryWrapper.eq("store_id",storeId); @@ -126,7 +126,7 @@ public class StaffCommissionServiceImpl extends ServiceImpl=Double.valueOf(staffCommission.getMeetCondition())){ - if (unit.equals("元")){ - commissionRecord.setAmount(royaltyRate); - } - if (unit.equals("%")){ - commissionRecord.setAmount(oilLiters*(royaltyRate/100)); - } - commissionRecordService.insertRecord(commissionRecord); - } - } +// if (staffCommission.getType().equals("refuleNum")){ +// if (oilLiters>=Double.valueOf(staffCommission.getMeetCondition())){ +// if (unit.equals("元")){ +// commissionRecord.setAmount(royaltyRate); +// } +// if (unit.equals("%")){ +// commissionRecord.setAmount(oilLiters*(royaltyRate/100)); +// } +// commissionRecordService.insertRecord(commissionRecord); +// } +// } } } } @@ -211,7 +211,7 @@ public class StaffCommissionServiceImpl extends ServiceImpl= Double.valueOf(staffCommission.getMeetCondition())) { - if (unit.equals("元")) { - commissionRecord.setAmount(royaltyRate); - } - if (unit.equals("%")) { - commissionRecord.setAmount(amount * (royaltyRate / 100)); - } - } - } -// 按照实付金额计算提成 - if (staffCommission.getType().equals("payAmount")) { - if (payAmount >= Double.valueOf(staffCommission.getMeetCondition())) { - if (unit.equals("元")) { - commissionRecord.setAmount(royaltyRate); - } - if (unit.equals("%")) { - commissionRecord.setAmount(payAmount * (royaltyRate / 100)); - } - } - } - commissionRecordService.insertRecord(commissionRecord); - } - } - } - if (type.equals("5") && staffCommission.getCommissionSource().equals("礼品卡")){ - for (String staffRoleGroup : staffRoleGroups) { - if (staff.getRoleId().equals(staffRoleGroup)) { - commissionRecord.setStaffId(staffId); - commissionRecord.setStoreId(storeId); - commissionRecord.setType(type); - commissionRecord.setDescription(staffCommission.getCommissionSource() + "订单出售提成"); - commissionRecord.setOrderNo(orderNo); - Double royaltyRate = Double.valueOf(staffCommission.getRoyaltyRate().substring(0, staffCommission.getRoyaltyRate().length() - 1)); - String unit = staffCommission.getRoyaltyRate().substring(staffCommission.getRoyaltyRate().length() - 1); -// 按照订单金额计算提成 - if (staffCommission.getType().equals("orderAmount")) { - if (amount >= Double.valueOf(staffCommission.getMeetCondition())) { - if (unit.equals("元")) { - commissionRecord.setAmount(royaltyRate); - } - if (unit.equals("%")) { - commissionRecord.setAmount(amount * (royaltyRate / 100)); - } - } - } -// 按照实付金额计算提成 - if (staffCommission.getType().equals("payAmount")) { - if (payAmount >= Double.valueOf(staffCommission.getMeetCondition())) { - if (unit.equals("元")) { - commissionRecord.setAmount(royaltyRate); - } - if (unit.equals("%")) { - commissionRecord.setAmount(payAmount * (royaltyRate / 100)); - } - } - } - commissionRecordService.insertRecord(commissionRecord); - } - } - } - if (type.equals("6") && staffCommission.getCommissionSource().equals("加油")){ + if (type.equals("4") && staffCommission.getCommissionSource().equals("囤油卡充值")){ for (String staffRoleGroup : staffRoleGroups) { if (staff.getRoleId().equals(staffRoleGroup)) { commissionRecord.setStaffId(staffId); diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/commission/vo/StaffPercentageVo.java b/fuintBackend/fuint-application/src/main/java/com/fuint/business/commission/vo/StaffPercentageVo.java new file mode 100644 index 000000000..c53bf0b8a --- /dev/null +++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/commission/vo/StaffPercentageVo.java @@ -0,0 +1,25 @@ +package com.fuint.business.commission.vo; + +import lombok.Data; + +@Data +public class StaffPercentageVo { +// 店铺id + private Integer storeId; +// 员工id + private Integer staffId; +// 员工名称 + private String staffName; +// 员工手机号 + private String staffMobile; +// 员工油卡充值提成 + private Double oilCardRecharge; +// 员工囤油卡充值提成 + private Double oilStorageRecharge; +// 员工油品出售提成（车主加油） + private Double oilSale; +// 员工非油品出售提成 + private Double goodsCommission; +// 员工提成汇总 + private Double summary; +} diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/member/mapper/xml/LJStaffMapper.xml b/fuintBackend/fuint-application/src/main/java/com/fuint/business/member/mapper/xml/LJStaffMapper.xml index 2d0e67139..27475abe2 100644 --- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/member/mapper/xml/LJStaffMapper.xml +++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/member/mapper/xml/LJStaffMapper.xml @@ -18,6 +18,9 @@ and status = #{staff.status} + + and id = #{staff.id} + diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/service/impl/OilOrderServiceImpl.java b/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/service/impl/OilOrderServiceImpl.java index 586ea6fbe..0d2ac70f4 100644 --- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/service/impl/OilOrderServiceImpl.java +++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/service/impl/OilOrderServiceImpl.java @@ -301,7 +301,7 @@ public class OilOrderServiceImpl extends ServiceImpl i ljOrder.setStaffId(staffId); ljOrder.setStatus(payStatus); if (payType.equals("CASH")){ - staffCommissionService.countStaffCommission(staffId,storeId,goodsAmount,goodsActualPay,0.0,"2",orderNo); + staffCommissionService.countStaffCommission(staffId,storeId,goodsAmount,goodsActualPay,"2",orderNo); ljOrder.setPayTime(new Date()); } // 将商品订单的json数据转换为数组 @@ -352,7 +352,7 @@ public class OilOrderServiceImpl extends ServiceImpl i order.setOrderNo(orderNo); order.setDiscountAmount(oilDiscount); if (payType.equals("CASH")){ - staffCommissionService.countStaffCommission(staffId,storeId,oilAmount,oilActualPay,oilLiters,"1",orderNo); + staffCommissionService.countStaffCommission(staffId,storeId,oilAmount,oilActualPay,"1",orderNo); } order.setCouponId(cardFavorableId); }else { @@ -750,7 +750,7 @@ public class OilOrderServiceImpl extends ServiceImpl i cashierOrder.setPayType(map.get("payType")); cashierOrderService.insertCashierOrder(cashierOrder); this.insertAllOrderInfo(orderNo, storeId, oilAmount, oilAmount, map.get("payType"), userId, "PC", "1", status); - staffCommissionService.countStaffCommission(Integer.valueOf(map.get("staffId")),storeId,oilAmount,oilAmount,oilLiters,"1",orderNo); + staffCommissionService.countStaffCommission(Integer.valueOf(map.get("staffId")),storeId,oilAmount,oilAmount,"1",orderNo); res.put("success","success"); } } @@ -815,7 +815,7 @@ public class OilOrderServiceImpl extends ServiceImpl i cashierOrderService.insertCashierOrder(cashierOrder); this.updateGrowthValue1(oilAmount,oilAmount,userId, Integer.valueOf(oilOrder.getOils()),0.0,storeId,orderNo); this.insertAllOrderInfo(orderNo,accountInfo.getStoreId(),oilAmount,oilAmount,map.get("payType"),userId,"PC","1","paid"); - staffCommissionService.countStaffCommission(Integer.valueOf(map.get("staffId")),storeId,oilAmount,oilAmount,oilLiters,"1",orderNo); + staffCommissionService.countStaffCommission(Integer.valueOf(map.get("staffId")),storeId,oilAmount,oilAmount,"1",orderNo); // this.insertCardBalance(oilAmount,userId,storeId); res.put("success","success"); }else { @@ -1124,7 +1124,7 @@ public class OilOrderServiceImpl extends ServiceImpl i this.insertCardOrder(oilOrder.getUserId(),oilOrder.getStoreId(),orderNo,oilOrder.getOrderAmount(),"paid", Double.valueOf(balanceAmount),payAmount); this.insertAllOrderInfo(orderNo,oilOrder.getStoreId(),oilOrder.getOrderAmount(),payAmount,oilOrder.getPayType(),oilOrder.getUserId(),"applet","1","paid"); this.insertCardBalance(Double.valueOf(balanceAmount),userId,oilOrder.getStoreId(),orderNo); - staffCommissionService.countStaffCommission(oilOrder.getStaffId(),oilOrder.getStoreId(),oilOrder.getOrderAmount(),oilOrder.getOrderAmount(),oilOrder.getOilNum(),"1",orderNo); + staffCommissionService.countStaffCommission(oilOrder.getStaffId(),oilOrder.getStoreId(),oilOrder.getOrderAmount(),oilOrder.getOrderAmount(),"1",orderNo); oilOrder.setPayAmount(payAmount); oilOrder.setDiscountAmount(Double.valueOf(discountAmount)); oilOrder.setPayTime(new Date()); @@ -1209,7 +1209,7 @@ public class OilOrderServiceImpl extends ServiceImpl i this.addOilTracks(oilOrder,oilOrder.getStoreId()); this.updateCardAndActiveById(oilOrder.getStoreId(),oilOrder.getUserId(),oilOrder.getActiveId(),oilOrder.getCouponId(),oilOrder.getActiveType(),oilOrder.getOrderAmount(), Integer.valueOf(oilOrder.getOils())); this.insertCardBalance(oilOrder.getOrderAmount()-oilOrder.getDiscountAmount()-oilOrder.getPayAmount(),userId,oilOrder.getStoreId(),orderNo); - staffCommissionService.countStaffCommission(oilOrder.getStaffId(),oilOrder.getStoreId(),oilOrder.getOrderAmount(),oilOrder.getPayAmount(),oilOrder.getOilNum(),"1",orderNo); + staffCommissionService.countStaffCommission(oilOrder.getStaffId(),oilOrder.getStoreId(),oilOrder.getOrderAmount(),oilOrder.getPayAmount(),"1",orderNo); } row = baseMapper.updateById(oilOrder); }