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

no message

Browse Source
This commit is contained in:
wangh 2024-03-04 09:53:32 +08:00
parent 973e7648d4
commit 509fa7aa3b
4 changed files with 21 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
fuintBackend/fuint-application/src/main/java/com/fuint/business/integral/service/impl/IntegralSettingsServiceImpl.java
View File

@ -107,6 +107,8 @@ public class IntegralSettingsServiceImpl implements IntegralSettingsService {
refuelConsumptionAmountMap.put("oilName", oilNumber.getOilName() + oilNumber.getOilType()); refuelConsumptionAmountMap.put("oilName", oilNumber.getOilName() + oilNumber.getOilType());
refuelConsumptionAmountMap.put("amount", 0); refuelConsumptionAmountMap.put("amount", 0);
refuelConsumptionAmountMap.put("integral", 0); refuelConsumptionAmountMap.put("integral", 0);
refuelConsumptionAmountMap.put("oilNameId",oilNumber.getId());
refuelConsumptionAmountList.add(refuelConsumptionAmountMap); refuelConsumptionAmountList.add(refuelConsumptionAmountMap);
} }
String refuelConsumptionAmount = JSON.toJSONString(refuelConsumptionAmountList); String refuelConsumptionAmount = JSON.toJSONString(refuelConsumptionAmountList);

5
fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardFule/service/impl/CardFuelRecordServiceImpl.java
View File

@ -13,6 +13,7 @@ import com.fuint.api.fuyou.entity.ReceiveParameter;
import com.fuint.api.fuyou.entity.ReturnParameter; import com.fuint.api.fuyou.entity.ReturnParameter;
import com.fuint.api.fuyou.service.FyPayService; import com.fuint.api.fuyou.service.FyPayService;
import com.fuint.api.fuyou.service.MerchantConfigService; import com.fuint.api.fuyou.service.MerchantConfigService;
import com.fuint.business.commission.service.StaffCommissionService;
import com.fuint.business.integral.entity.IntegralDetail; import com.fuint.business.integral.entity.IntegralDetail;
import com.fuint.business.integral.service.IntegralDetailService; import com.fuint.business.integral.service.IntegralDetailService;
import com.fuint.business.marketingActivity.cardFule.dto.CardFuelRecordDTO; import com.fuint.business.marketingActivity.cardFule.dto.CardFuelRecordDTO;
@ -274,6 +275,8 @@ public class CardFuelRecordServiceImpl implements CardFuelRecordService {
@Autowired @Autowired
private RedisLock redisLock; private RedisLock redisLock;
@Autowired
private StaffCommissionService staffCommissionService;
private static String beforeLitres = new String("0"); private static String beforeLitres = new String("0");
/** /**
* 查询支付状态 修改相关关联表 * 查询支付状态 修改相关关联表
@ -310,6 +313,8 @@ public class CardFuelRecordServiceImpl implements CardFuelRecordService {
IntegralDetail integralDetail = changesInPoints(cardFuelRecord,ljUserVos); IntegralDetail integralDetail = changesInPoints(cardFuelRecord,ljUserVos);
integralDetailService.insert2(integralDetail); integralDetailService.insert2(integralDetail);
} }
// 员工提成
staffCommissionService.countStaffCommission(cardFuelRecord.getMtStaffId(),cardFuelRecord.getStoreId(),cardFuelRecord.getRechargeBalance(),cardFuelRecord.getRechargeBalance(),"4",cardFuelRecord.getPaymentNo());
CardFuelRecord editCardFuelRecord = new CardFuelRecord(); CardFuelRecord editCardFuelRecord = new CardFuelRecord();
editCardFuelRecord.setId(id); editCardFuelRecord.setId(id);

17
fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardValue/service/impl/CardValueRecordServiceImpl.java
View File

@ -17,6 +17,7 @@ import com.fuint.api.fuyou.service.MerchantConfigService;
import com.fuint.business.commission.entity.CommissionRecord; import com.fuint.business.commission.entity.CommissionRecord;
import com.fuint.business.commission.mapper.CommissionRecordMapper; import com.fuint.business.commission.mapper.CommissionRecordMapper;
import com.fuint.business.commission.service.CommissionRecordService; import com.fuint.business.commission.service.CommissionRecordService;
import com.fuint.business.commission.service.StaffCommissionService;
import com.fuint.business.integral.entity.IntegralDetail; import com.fuint.business.integral.entity.IntegralDetail;
import com.fuint.business.integral.service.IntegralDetailService; import com.fuint.business.integral.service.IntegralDetailService;
import com.fuint.business.marketingActivity.cardExchange.entity.CardExchange; import com.fuint.business.marketingActivity.cardExchange.entity.CardExchange;
@ -108,6 +109,8 @@ public class CardValueRecordServiceImpl extends ServiceImpl<CardValueRecordMappe
@Resource @Resource
CommissionRecordService commissionRecordService; CommissionRecordService commissionRecordService;
@Resource @Resource
StaffCommissionService staffCommissionService;
@Resource
CardValueRecordMapper cardValueRecordMapper; CardValueRecordMapper cardValueRecordMapper;
@Resource @Resource
RocketUtil rocketUtil; RocketUtil rocketUtil;
@ -469,7 +472,9 @@ public class CardValueRecordServiceImpl extends ServiceImpl<CardValueRecordMappe
AccountInfo nowAccountInfo = TokenUtil.getNowAccountInfo(); AccountInfo nowAccountInfo = TokenUtil.getNowAccountInfo();
CardValueRecord cardValueRecord = baseMapper.selectById(id); CardValueRecord cardValueRecord = baseMapper.selectById(id);
if (ObjectUtil.isEmpty(cardValueRecord.getMtStaffId())) {
cardValueRecord.setMtStaffId(nowAccountInfo.getStaffId());
}
String lockKey = "CardValueRecord"+nowAccountInfo.getStoreId()+id; String lockKey = "CardValueRecord"+nowAccountInfo.getStoreId()+id;
Boolean isLock = redisLock.tryLock(lockKey, 5000, TimeUnit.MILLISECONDS); Boolean isLock = redisLock.tryLock(lockKey, 5000, TimeUnit.MILLISECONDS);
// 支付成功之后 // 支付成功之后
@ -526,10 +531,12 @@ public class CardValueRecordServiceImpl extends ServiceImpl<CardValueRecordMappe
growthValueChangeService.insertGrowthValueChange(growthValueChange); growthValueChangeService.insertGrowthValueChange(growthValueChange);
} }
// 员工提成 // 员工提成
if (ObjectUtil.isNotEmpty(cardValueRecord.getMtStaffId()) && !ObjectUtil.isEmpty(cardValueRecord.getRoyaltyType()) && !"1".equals(cardValueRecord.getRoyaltyType())) { // if (ObjectUtil.isNotEmpty(cardValueRecord.getMtStaffId()) && !ObjectUtil.isEmpty(cardValueRecord.getRoyaltyType()) && !"1".equals(cardValueRecord.getRoyaltyType())) {
CommissionRecord commissionRecord = employeeCommissions(cardValueRecord); // if (ObjectUtil.isNotEmpty(cardValueRecord.getMtStaffId())) {
commissionRecordService.insert2(commissionRecord); // CommissionRecord commissionRecord = employeeCommissions(cardValueRecord);
} // commissionRecordService.insert2(commissionRecord);
staffCommissionService.countStaffCommission(cardValueRecord.getMtStaffId(),cardValueRecord.getStoreId(),cardValueRecord.getBidBalance(),cardValueRecord.getRechargeBalance(),"3",cardValueRecord.getPaymentNo());
// }
//员工信息 //员工信息
LJStaff ljStaff = mtStaffService.selectStaffById(cardValueRecord.getMtStaffId()); LJStaff ljStaff = mtStaffService.selectStaffById(cardValueRecord.getMtStaffId());
// 处理赠送兑换券或者其他 // 处理赠送兑换券或者其他