修改账单查询条件

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

@@ -7,6 +7,7 @@ import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiParam;
 import lombok.AllArgsConstructor;
 import org.apache.commons.lang3.ObjectUtils;
+import org.springblade.common.enums.OrderType;
 import org.springblade.core.mp.support.Condition;
 import org.springblade.core.mp.support.Query;
 import org.springblade.core.tool.api.R;
@@ -26,8 +27,6 @@ import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
-import java.util.List;
-
 /**
  * 账单追溯
  */
@@ -60,7 +59,8 @@ public class BillTraceController {
 				billDataCensusDto.setPointBills(pointBills);
 			}
 
-			BalanceBills balanceBill = balanceBillsService.getOne(Wrappers.<BalanceBills>lambdaQuery().eq(BalanceBills::getTradeNo, bills.getId()));
+			BalanceBills balanceBill = balanceBillsService.getOne(Wrappers.<BalanceBills>lambdaQuery()
+				.eq(BalanceBills::getTradeNo, bills.getId()).eq(BalanceBills::getType, OrderType.PAY_CONSUMER));
 			if (ObjectUtils.isNotEmpty(balanceBill)) {
 				BalanceBillsVO balanceBills = BalanceBillsWrapper.build(loginUserService, shopService, mallService).entityVO(balanceBill);
 				billDataCensusDto.setBalanceBills(balanceBills);
@@ -94,7 +94,7 @@ public class BillTraceController {
 	@GetMapping("/getBills")
 	@ApiOperation(value = "账单列表分页", notes = "传入bills")
 	public R<IPage<BillsVO>> list(Bills bills, Query query) {
-		IPage<Bills> iPage = billsService.page(Condition.getPage(query),Condition.getQueryWrapper(bills).lambda().orderByDesc(Bills::getCreateTime));
+		IPage<Bills> iPage = billsService.page(Condition.getPage(query), Condition.getQueryWrapper(bills).lambda().orderByDesc(Bills::getCreateTime));
 		return R.data(BillsWrapper.build(loginUserService, shopService, mallService).pageVO(iPage));
 	}