gxwebsoft/yunxinwei-java
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

feat：订单查询，同步免押字段

Browse Source
This commit is contained in:
yangqingyuan
2024-09-03 15:44:02 +08:00
parent 252aac6e82
commit 79075bdebe
2 changed files with 19 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/main/java/com/gxwebsoft/shop/controller/OrderPayController.java
View File

@@ -80,8 +80,19 @@ public class OrderPayController extends BaseController {
PageParam<OrderPay, OrderPayParam> page = new PageParam<>(param); PageParam<OrderPay, OrderPayParam> page = new PageParam<>(param);
page.setDefaultOrder("create_time desc"); page.setDefaultOrder("create_time desc");
//return success(orderPayService.list(page.getOrderWrapper())); //return success(orderPayService.list(page.getOrderWrapper()));
List<OrderPay> orderPays = orderPayService.listRel(param);
if (null != param.getRentOrderId() && 0 != param.getRentOrderId()) {//如果是单个查询
Order order = orderService.getById(param.getRentOrderId());
if (null != order && !orderPays.isEmpty()) {
orderPays.forEach(orderPay -> {
orderPay.setIsCreditAuth(order.getIsCreditAuth());//小程序端用于判断是否显示芝麻信用免押
orderPay.setIsFreeze(order.getIsFreeze());
});
}
}
// 使用关联查询 // 使用关联查询
return success(orderPayService.listRel(param)); return success(orderPays);
} }
@GetMapping("/{id}") @GetMapping("/{id}")
@@ -166,6 +177,7 @@ public class OrderPayController extends BaseController {
orderPayService.save(one); orderPayService.save(one);
} }
one.setIsFreeze(order.getIsFreeze()); one.setIsFreeze(order.getIsFreeze());
one.setIsCreditAuth(order.getIsCreditAuth());
one.setIsRenew(isRenew); one.setIsRenew(isRenew);
if (isRenew == null || isRenew == 0) { if (isRenew == null || isRenew == 0) {
@@ -236,9 +248,9 @@ public class OrderPayController extends BaseController {
order.setExpirationTime(orderPay.getExpirationTime()); order.setExpirationTime(orderPay.getExpirationTime());
orderService.updateById(order); orderService.updateById(order);
OrderPay olderPay = orderPayService.getOne(Wrappers.lambdaQuery(OrderPay.class).eq(OrderPay::getOrderNo,orderPay.getOrderNo())); OrderPay olderPay = orderPayService.getOne(Wrappers.lambdaQuery(OrderPay.class).eq(OrderPay::getOrderNo, orderPay.getOrderNo()));
OrderPay newOrderPay = new OrderPay(); OrderPay newOrderPay = new OrderPay();
BeanCopier.create(olderPay, newOrderPay, CopyOptions.create().ignoreNullValue().setIgnoreProperties("id","orderNo")).copy(); BeanCopier.create(olderPay, newOrderPay, CopyOptions.create().ignoreNullValue().setIgnoreProperties("id", "orderNo")).copy();
newOrderPay.setOrderPrice(BigDecimal.valueOf(orderPay.getOrderPriceInt())); newOrderPay.setOrderPrice(BigDecimal.valueOf(orderPay.getOrderPriceInt()));

4
src/main/java/com/gxwebsoft/shop/entity/OrderPay.java
View File

@@ -184,6 +184,10 @@ public class OrderPay implements Serializable {
@TableField(exist = false) @TableField(exist = false)
private Integer isFreeze; private Integer isFreeze;
@ApiModelProperty(value = "信用预授权,即免押模式，0：非免押，1免押")
@TableField(exist = false)
private Integer isCreditAuth;
@ApiModelProperty(value = "是否续费单") @ApiModelProperty(value = "是否续费单")
@TableField(exist = false) @TableField(exist = false)
private Integer isRenew; private Integer isRenew;