|
|
@@ -22,9 +22,9 @@ import org.springblade.common.utils.SpringContextHolder;
|
|
|
import org.springblade.core.mp.support.BaseEntityWrapper;
|
|
|
import org.springblade.core.tool.utils.BeanUtil;
|
|
|
import org.springblade.gateway.common_gateway.entity.vo.AppBillsVO;
|
|
|
+import org.springblade.ldt.bills.entity.BalanceBills;
|
|
|
import org.springblade.ldt.bills.entity.Bills;
|
|
|
-import org.springblade.ldt.bills.entity.PointBills;
|
|
|
-import org.springblade.ldt.bills.service.IPointBillsService;
|
|
|
+import org.springblade.ldt.bills.service.IBalanceBillsService;
|
|
|
import org.springblade.ldt.shop.entity.Shop;
|
|
|
import org.springblade.ldt.shop.service.IShopService;
|
|
|
import org.springblade.ldt.user.entity.LoginUser;
|
|
|
@@ -42,7 +42,7 @@ public class AppBillsWrapper extends BaseEntityWrapper<Bills, AppBillsVO> {
|
|
|
|
|
|
private ILoginUserService loginUserService;
|
|
|
private IShopService shopService;
|
|
|
- private final static IPointBillsService pointBillsService = SpringContextHolder.getBean(IPointBillsService.class);
|
|
|
+ private final static IBalanceBillsService balanceBillsService = SpringContextHolder.getBean(IBalanceBillsService.class);
|
|
|
|
|
|
public AppBillsWrapper(ILoginUserService loginUserService) {
|
|
|
this.loginUserService = loginUserService;
|
|
|
@@ -81,11 +81,11 @@ public class AppBillsWrapper extends BaseEntityWrapper<Bills, AppBillsVO> {
|
|
|
}
|
|
|
}
|
|
|
//查询积分账单
|
|
|
- PointBills pointBills = pointBillsService.getOne(
|
|
|
- Wrappers.<PointBills>lambdaQuery()
|
|
|
- .eq(PointBills::getTradeNo, appBillsVO.getId()));
|
|
|
- if(ObjectUtils.isNotEmpty(pointBills)){
|
|
|
- appBillsVO.setSendPoint(-pointBills.getPrice().doubleValue());
|
|
|
+ BalanceBills balanceBills = balanceBillsService.getOne(
|
|
|
+ Wrappers.<BalanceBills>lambdaQuery()
|
|
|
+ .eq(BalanceBills::getTradeNo, appBillsVO.getId()));
|
|
|
+ if(ObjectUtils.isNotEmpty(balanceBills)){
|
|
|
+ appBillsVO.setSendPoint(-balanceBills.getPrice().doubleValue());
|
|
|
}
|
|
|
return appBillsVO;
|
|
|
}
|
