Merge remote-tracking branch 'origin/dev' into dev

ldt-core/src/main/java/org/springblade/gateway/client_gateway/controller/AgentController.java

@@ -148,11 +148,12 @@ public class AgentController {
 		bills.setBalanceNum(BigDecimal.ZERO);
 		bills.setPrice(agentLeagueRecord.getLeague());
 		bills.setPayPlugin(PaymentType.YEE_PAY.name());
-		bills.setReceiveId(agentLeagueRecord.getUserId());
+		bills.setPayId(agentLeagueRecord.getUserId());
 		bills.setTitle("代理缴费");
 		bills.setPayStatus(AppConstant.BillPayStatus.待付款.name());
 		bills.setPayScene(PaymentScene.SCAN_CODE.name());
 		bills.setCost(agentLeagueRecord.getLeague());
+		bills.setTotalPrice(agentLeagueRecord.getLeague());
 		bills.setType(OrderType.AGENT_CHARGE.name());
 		bills.setDiscount(BigDecimal.ONE);
 		org.springframework.util.Assert.isTrue(billsService.saveOrUpdate(bills), () -> {

ldt-core/src/main/java/org/springblade/gateway/web_gateway/controller/BillTraceController.java

@@ -11,16 +11,14 @@ import org.springblade.core.mp.support.Condition;
 import org.springblade.core.mp.support.Query;
 import org.springblade.core.tool.api.R;
 import org.springblade.gateway.web_gateway.entity.dto.BillDataCensusDto;
+import org.springblade.ldt.agent.entity.AgentLeagueRecord;
+import org.springblade.ldt.agent.service.IAgentLeagueRecordService;
+import org.springblade.ldt.agent.vo.AgentLeagueRecordVO;
+import org.springblade.ldt.agent.wrapper.AgentLeagueRecordWrapper;
 import org.springblade.ldt.bills.entity.*;
 import org.springblade.ldt.bills.service.*;
-import org.springblade.ldt.bills.vo.BalanceBillsVO;
-import org.springblade.ldt.bills.vo.BillsVO;
-import org.springblade.ldt.bills.vo.PlatformBillsVO;
-import org.springblade.ldt.bills.vo.PointBillsVO;
-import org.springblade.ldt.bills.wrapper.BalanceBillsWrapper;
-import org.springblade.ldt.bills.wrapper.BillsWrapper;
-import org.springblade.ldt.bills.wrapper.PlatformBillsWrapper;
-import org.springblade.ldt.bills.wrapper.PointBillsWrapper;
+import org.springblade.ldt.bills.vo.*;
+import org.springblade.ldt.bills.wrapper.*;
 import org.springblade.ldt.mall.service.IMallService;
 import org.springblade.ldt.shop.service.IShopService;
 import org.springblade.ldt.user.service.ILoginUserService;
@@ -45,31 +43,48 @@ public class BillTraceController {
 	private IBalanceBillsService balanceBillsService;
 	private IFrozenRecService frozenRecService;
 	private IPlatformBillsService platformBillsService;
+	private IAgentLeagueRecordService agentLeagueRecordService;
+	private IGoodsBillsService goodsBillsService;
 
 	@GetMapping()
 	@ApiOperation(value = "账单追溯")
 	public R getBillTrace(@ApiParam(required = true) Long billId) {
-		BillDataCensusDto billDataCensusDto = null;
+		BillDataCensusDto billDataCensusDto = new BillDataCensusDto();
 		BillsVO bills = BillsWrapper.build(loginUserService, shopService, mallService).entityVO(billsService.getById(billId));
 		if (ObjectUtils.isNotEmpty(bills)) {
 			PointBills pointBill = pointBillsService.getOne(Wrappers.<PointBills>lambdaQuery().eq(PointBills::getTradeNo, bills.getId()));
-			PointBillsVO pointBills = PointBillsWrapper.build(loginUserService, shopService, mallService).entityVO(pointBill);
+			if (ObjectUtils.isNotEmpty(pointBill)) {
+				PointBillsVO pointBills = PointBillsWrapper.build(loginUserService, shopService, mallService).entityVO(pointBill);
+				billDataCensusDto.setPointBills(pointBills);
+			}
 
 			BalanceBills balanceBill = balanceBillsService.getOne(Wrappers.<BalanceBills>lambdaQuery().eq(BalanceBills::getTradeNo, bills.getId()));
-			BalanceBillsVO balanceBills = BalanceBillsWrapper.build(loginUserService, shopService, mallService).entityVO(balanceBill);
-
-			FrozenRec frozenRec = frozenRecService.getOne(Wrappers.<FrozenRec>lambdaQuery().eq(FrozenRec::getTradeNo, bills.getId()));
+			if (ObjectUtils.isNotEmpty(balanceBill)) {
+				BalanceBillsVO balanceBills = BalanceBillsWrapper.build(loginUserService, shopService, mallService).entityVO(balanceBill);
+				billDataCensusDto.setBalanceBills(balanceBills);
+			}
 
 			PlatformBills platformBill = platformBillsService.getOne(Wrappers.<PlatformBills>lambdaQuery().eq(PlatformBills::getPayment, bills.getId()));
-			PlatformBillsVO platformBills = PlatformBillsWrapper.build(loginUserService, shopService, mallService).entityVO(platformBill);
+			if (ObjectUtils.isNotEmpty(platformBill)) {
+				PlatformBillsVO platformBills = PlatformBillsWrapper.build(loginUserService, shopService, mallService).entityVO(platformBill);
+				billDataCensusDto.setPlatformBills(platformBills);
+			}
+
+			AgentLeagueRecord agentLeagueRecord = agentLeagueRecordService.getOne(Wrappers.<AgentLeagueRecord>lambdaQuery().eq(AgentLeagueRecord::getTradeNo, bills.getId()));
+			if (ObjectUtils.isNotEmpty(agentLeagueRecord)) {
+				AgentLeagueRecordVO agentLeague = AgentLeagueRecordWrapper.build().entityVO(agentLeagueRecord);
+				billDataCensusDto.setAgentLeagueRecord(agentLeague);
+			}
 
-			billDataCensusDto = BillDataCensusDto.builder()
-				.bills(bills)
-				.pointBills(pointBills)
-				.balanceBills(balanceBills)
-				.frozenRec(frozenRec)
-				.platformBills(platformBills)
-				.build();
+			GoodsBills goodsBill = goodsBillsService.getOne(Wrappers.<GoodsBills>lambdaQuery().eq(GoodsBills::getBillsId, bills.getId()));
+			if (ObjectUtils.isNotEmpty(goodsBill)) {
+				GoodsBillsVO goodsBills = GoodsBillsWrapper.build().entityVO(goodsBill);
+				billDataCensusDto.setGoodsBills(goodsBills);
+			}
+
+			FrozenRec frozenRec = frozenRecService.getOne(Wrappers.<FrozenRec>lambdaQuery().eq(FrozenRec::getTradeNo, bills.getId()));
+			billDataCensusDto.setBills(bills);
+			billDataCensusDto.setFrozenRec(frozenRec);
 		}
 		return R.data(billDataCensusDto);
 	}

ldt-core/src/main/java/org/springblade/gateway/web_gateway/entity/dto/BillDataCensusDto.java

@@ -4,11 +4,9 @@ import lombok.AllArgsConstructor;
 import lombok.Builder;
 import lombok.Data;
 import lombok.NoArgsConstructor;
-import org.springblade.ldt.bills.entity.*;
-import org.springblade.ldt.bills.vo.BalanceBillsVO;
-import org.springblade.ldt.bills.vo.BillsVO;
-import org.springblade.ldt.bills.vo.PlatformBillsVO;
-import org.springblade.ldt.bills.vo.PointBillsVO;
+import org.springblade.ldt.agent.vo.AgentLeagueRecordVO;
+import org.springblade.ldt.bills.entity.FrozenRec;
+import org.springblade.ldt.bills.vo.*;
 
 /**
  * @author July
@@ -27,4 +25,6 @@ public class BillDataCensusDto {
 	private BalanceBillsVO balanceBills;
 	private FrozenRec frozenRec;
 	private PlatformBillsVO platformBills;
+	private AgentLeagueRecordVO agentLeagueRecord;
+	private GoodsBillsVO goodsBills;
 }