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-01-13 15:04:45 +08:00
parent 8952d5ca31
commit bff603b970
3 changed files with 53 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
fuintAdmin/src/views/member/userInfo.vue
View File

@ -1170,6 +1170,7 @@ export default {
this.cardValueForm.royaltyType = change.royaltyType
this.cardValueForm.percentageCommissions = change.percentageCommissions
this.cardValueForm.amountCommission = change.amountCommission
this.cardValueForm.cardValueId = change.id
// this.cardValueForm.rechargeBalance
// 计算员工提成金额
@ -1384,13 +1385,14 @@ export default {
let file = {}
// 拿到金额
file = this.cardValueList[index]
console.log("file",file)
this.realyPayBills = file.rechargeBalance
this.cardValueForm.rechargeBalance = file.rechargeBalance
this.cardValueForm.bidBalance = file.bidBalance
this.cardValueForm.points = file.points
this.cardValueForm.giftBalance = file.giftBalance
this.cardValueForm.growthValue = file.growthValue
this.cardValueForm.cardValueId = file.id
this.cardValueForm.amount = null
this.cardValueForm.royaltyType = file.royaltyType
@ -1427,7 +1429,6 @@ export default {
this.cardFuelDieselForm.incomeLitres = file.incomeLitres
this.cardFuelDieselForm.lockupPrice = file.lockupPrice
this.cardFuelDieselForm.cardFuelId = file.id
// this.realyPayBills = file.rechargeBalance
},

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

@ -216,6 +216,7 @@ public class IntegralOrdersServiceImpl implements IntegralOrdersService {
integralOrders.setOrderNumber(orderNo);
integralOrders.setStatus(status);
integralOrders.setOrderType("1"); // 设置交易类型
integralOrders.setChainStoreId(nowAccountInfo.getChainStoreId()); // 设置交易类型
}
@ -356,7 +357,6 @@ public class IntegralOrdersServiceImpl implements IntegralOrdersService {
cardExchangeRecordService.addCardExchangeRecord(cardExchangeRecord);
}else if (integralGift.getGiftType().equals("优惠券")) {
// 优惠卷处理
integralGift.getCouponId();
CardFavorableRecord cardFavorableRecord = new CardFavorableRecord();
cardFavorableRecord.setCardFavorableId(integralGift.getCouponId());
cardFavorableRecord.setStoreId(integralOrders.getStoreId());

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

@ -28,8 +28,10 @@ import com.fuint.business.marketingActivity.cardFavorable.service.CardFavorableR
import com.fuint.business.marketingActivity.cardFavorable.service.CardFavorableService;
import com.fuint.business.marketingActivity.cardValue.dto.CardValueRecordDTO;
import com.fuint.business.marketingActivity.cardValue.entity.CardValueChild;
import com.fuint.business.marketingActivity.cardValue.mapper.CardValueChildMapper;
import com.fuint.business.marketingActivity.cardValue.mapper.CardValueRecordMapper;
import com.fuint.business.marketingActivity.cardValue.entity.CardValueRecord;
import com.fuint.business.marketingActivity.cardValue.service.CardValueChildService;
import com.fuint.business.marketingActivity.cardValue.service.CardValueRecordService;
import com.fuint.business.marketingActivity.cardValue.service.CardValueService;
import com.fuint.business.marketingActivity.cardValue.vo.CardValueVO;
@ -407,7 +409,11 @@ public class CardValueRecordServiceImpl extends ServiceImpl<CardValueRecordMappe
@Autowired
private RedisLock redisLock;
@Resource
CardValueChildService cardValueChildService;
@Resource
CardValueChildMapper cardValueChildMapper;
/**
* 查询支付状态 修改相关关联表
@ -470,7 +476,50 @@ public class CardValueRecordServiceImpl extends ServiceImpl<CardValueRecordMappe
CommissionRecord commissionRecord = employeeCommissions(cardValueRecord);
commissionRecordService.insert2(commissionRecord);
}
//员工信息
LJStaff ljStaff = mtStaffService.selectStaffById(cardValueRecord.getMtStaffId());
// 处理赠送兑换券或者其他
LambdaQueryWrapper<CardValueChild> lambdaQueryWrapper = new LambdaQueryWrapper<CardValueChild>();
lambdaQueryWrapper.eq(CardValueChild::getCardValueId,cardValueRecord.getCardValueId());
List<CardValueChild> cardValueChildren = cardValueChildMapper.selectList(lambdaQueryWrapper);
for (CardValueChild cardValueChild : cardValueChildren) {
try{
if ("1".equals(cardValueChild.getActiveGift())){
//优惠券
CardFavorableRecord cardFavorableRecord = new CardFavorableRecord();
cardFavorableRecord.setCardFavorableId(cardValueChild.getVouchersId());
cardFavorableRecord.setStoreId(cardValueRecord.getStoreId());
cardFavorableRecord.setMtUserId(cardValueRecord.getMtUserId());
cardFavorableRecord.setName(ljUserVos.getName());
cardFavorableRecord.setMobile(ljUserVos.getMobile());
cardFavorableRecord.setStatus("0");
cardFavorableRecord.setExchangeFrom("储值卡赠送");
}else if("2".equals(cardValueChild.getActiveGift())) {
//兑换券
CardExchangeRecord cardExchangeRecord = new CardExchangeRecord();
cardExchangeRecord.setCardExchangeId(cardValueChild.getVouchersId());
cardExchangeRecord.setStoreId(cardValueRecord.getStoreId());
cardExchangeRecord.setMtUserId(cardValueRecord.getMtUserId());
cardExchangeRecord.setName(ljUserVos.getName());
cardExchangeRecord.setMobile(ljUserVos.getMobile());
cardExchangeRecord.setPhoto(ljUserVos.getAvatar());
if (ObjectUtil.isNotEmpty(ljStaff)) {
cardExchangeRecord.setMtStaffId(ljStaff.getId());
cardExchangeRecord.setRealName(ljStaff.getRealName());
cardExchangeRecord.setStaffMobile(ljStaff.getMobile());
}
cardExchangeRecord.setStatus("0");
cardExchangeRecord.setExchangeFrom("储值卡赠送");
cardExchangeRecordService.addCardExchangeRecord(cardExchangeRecord);
}
}catch (Exception e) {
e.printStackTrace();
continue;
}
}
// 修改订单的处理状态 (避免二次执行)
CardValueRecord updateCardValueRecord = new CardValueRecord();
updateCardValueRecord.setId(id);