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-03-01 15:07:56 +08:00
parent a16552120f
commit 72449acbb7
6 changed files with 48 additions and 10 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/marketingActivity/activeConsumption/controller/ActiveConsumptionController.java
View File

@ -134,7 +134,7 @@ public class ActiveConsumptionController extends BaseController {
/**
* 优惠券、兑换券使用详情
*
* @param id 主键
* @param activeConsumption 主键
* @return 单条数据
*/
@GetMapping("/detailRecord")

10
fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/activeDiscount/controller/ActiveDiscountController.java
View File

@ -102,6 +102,16 @@ public class ActiveDiscountController extends BaseController {
return getSuccessResult(this.activeDiscountService.removeByIds(idList));
}
/**
* 删除数据
* @param ids
* @return
*/
@DeleteMapping("delById/{ids}")
public ResponseObject delete(@PathVariable Long ids) {
return getSuccessResult(this.activeDiscountService.removeById(ids));
}
/**
* 删除数据
*

10
fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/activeFullminus/controller/ActiveFullminusController.java
View File

@ -102,7 +102,15 @@ public class ActiveFullminusController extends BaseController {
public ResponseObject delete(@RequestParam("idList") List<Long> idList) {
return getSuccessResult(this.activeFullminusService.removeByIds(idList));
}
/**
* 删除数据
* @param ids
* @return
*/
@DeleteMapping("delById/{ids}")
public ResponseObject delete(@PathVariable Long ids) {
return getSuccessResult(this.activeFullminusService.removeById(ids));
}
/**
* 删除数据
*

10
fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/activeNewlyweds/controller/ActiveNewlywedsController.java
View File

@ -102,6 +102,16 @@ public class ActiveNewlywedsController extends BaseController {
return getSuccessResult(this.activeNewlywedsService.removeByIds(idList));
}
/**
* 删除数据
* @param ids
* @return
*/
@DeleteMapping("delById/{ids}")
public ResponseObject delete(@PathVariable Long ids) {
return getSuccessResult(this.activeNewlywedsService.removeById(ids));
}
/**
* 删除卡券
*

9
fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/activeRecommend/controller/ActiveRecommendController.java
View File

@ -105,6 +105,15 @@ public class ActiveRecommendController extends BaseController {
public ResponseObject delete(@RequestParam("idList") List<Long> idList) {
return getSuccessResult(this.activeRecommendService.removeByIds(idList));
}
/**
* 删除数据
* @param ids
* @return
*/
@DeleteMapping("delById/{ids}")
public ResponseObject delete(@PathVariable Long ids) {
return getSuccessResult(this.activeRecommendService.removeById(ids));
}
/**
* 删除卡券

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.mapper.CommissionRecordMapper;
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.service.IntegralDetailService;
import com.fuint.business.marketingActivity.cardExchange.entity.CardExchange;
@ -102,15 +103,13 @@ public class CardValueRecordServiceImpl extends ServiceImpl<CardValueRecordMappe
@Autowired
private FyPayService fyPayService;
@Resource
CardBalanceChangeService cardBalanceChangeService;
private CardBalanceChangeService cardBalanceChangeService;
@Resource
IntegralDetailService integralDetailService;
private IntegralDetailService integralDetailService;
@Resource
CommissionRecordService commissionRecordService;
private CommissionRecordService commissionRecordService;
@Resource
CardValueRecordMapper cardValueRecordMapper;
@Resource
RocketUtil rocketUtil;
private CardValueRecordMapper cardValueRecordMapper;
@Resource
private MtStaffMapper mtStaffMapper;
@Resource
@ -128,9 +127,9 @@ public class CardValueRecordServiceImpl extends ServiceImpl<CardValueRecordMappe
@Autowired
private ILJStoreService storeService;
@Resource
private CommissionRecordMapper commissionRecordMapper;
@Resource
private MtUserGradeChildService userGradeChildService;
@Resource
private StaffCommissionService staffCommissionService;
/**
* 储值卡充值（新增）
@ -228,6 +227,7 @@ public class CardValueRecordServiceImpl extends ServiceImpl<CardValueRecordMappe
cardValueOrders.setAmountCommission(multiply.doubleValue());
}
}
if (ObjectUtils.isNotEmpty(cardValue.getAmountCommission())){
cardValueOrders.setAmountCommission(cardValue.getAmountCommission());
}
@ -851,6 +851,7 @@ public class CardValueRecordServiceImpl extends ServiceImpl<CardValueRecordMappe
commissionRecord.setType("3");
commissionRecord.setOrderNo(cardValueOrders.getOrderNo());
}
staffCommissionService.countStaffCommission(cardValueOrders.getStaffId(),cardValueOrders.getStoreId(),cardValueOrders.getAmount(),cardValueOrders.getPayAmount(),"3",cardValueOrders.getOrderNo());
//用户余额变化记录
cardBalanceChange.setUserId(cardValueOrders.getMtUserId());
cardBalanceChange.setStoreId(cardValueOrders.getStoreId());