diff --git a/ruoyi-modules/ruoyi-work/src/main/java/org/dromara/work/domain/TpOrder.java b/ruoyi-modules/ruoyi-work/src/main/java/org/dromara/work/domain/TpOrder.java index e95c4c0..5aed123 100644 --- a/ruoyi-modules/ruoyi-work/src/main/java/org/dromara/work/domain/TpOrder.java +++ b/ruoyi-modules/ruoyi-work/src/main/java/org/dromara/work/domain/TpOrder.java @@ -235,6 +235,16 @@ public class TpOrder { */ private String byThree; + /** + * 抵扣金 + */ + private BigDecimal coupon; + + /** + * 集材社订单ID + */ + private Long jcOrderId; + /** * 接待客服名称 */ diff --git a/ruoyi-modules/ruoyi-work/src/main/java/org/dromara/work/domain/bo/TpOrderBo.java b/ruoyi-modules/ruoyi-work/src/main/java/org/dromara/work/domain/bo/TpOrderBo.java index c84ec91..57a4544 100644 --- a/ruoyi-modules/ruoyi-work/src/main/java/org/dromara/work/domain/bo/TpOrderBo.java +++ b/ruoyi-modules/ruoyi-work/src/main/java/org/dromara/work/domain/bo/TpOrderBo.java @@ -316,4 +316,14 @@ public class TpOrderBo extends BaseEntity { */ private String byThree; + /** + * 抵扣金 + */ + private BigDecimal coupon; + + /** + * 集材社订单ID + */ + private Long jcOrderId; + } diff --git a/ruoyi-modules/ruoyi-work/src/main/java/org/dromara/work/domain/vo/TpOrderVo.java b/ruoyi-modules/ruoyi-work/src/main/java/org/dromara/work/domain/vo/TpOrderVo.java index a74263d..b0ae4a7 100644 --- a/ruoyi-modules/ruoyi-work/src/main/java/org/dromara/work/domain/vo/TpOrderVo.java +++ b/ruoyi-modules/ruoyi-work/src/main/java/org/dromara/work/domain/vo/TpOrderVo.java @@ -322,4 +322,14 @@ public class TpOrderVo implements Serializable { */ private String byThree; + /** + * 抵扣金 + */ + private BigDecimal coupon; + + /** + * 集材社订单ID + */ + private Long jcOrderId; + } diff --git a/ruoyi-modules/ruoyi-work/src/main/java/org/dromara/work/service/ITpOrderService.java b/ruoyi-modules/ruoyi-work/src/main/java/org/dromara/work/service/ITpOrderService.java index bf0fa7b..947dff1 100644 --- a/ruoyi-modules/ruoyi-work/src/main/java/org/dromara/work/service/ITpOrderService.java +++ b/ruoyi-modules/ruoyi-work/src/main/java/org/dromara/work/service/ITpOrderService.java @@ -199,4 +199,11 @@ public interface ITpOrderService extends MPJBaseService { * @return */ List queryList(TpOrderBo bo); + + /** + * 修改订单信息 + * @param bo + * @return + */ + Boolean updateInfoByBo(TpOrderBo bo); } diff --git a/ruoyi-modules/ruoyi-work/src/main/java/org/dromara/work/service/impl/TpOrderServiceImpl.java b/ruoyi-modules/ruoyi-work/src/main/java/org/dromara/work/service/impl/TpOrderServiceImpl.java index 3273c89..7875fdb 100644 --- a/ruoyi-modules/ruoyi-work/src/main/java/org/dromara/work/service/impl/TpOrderServiceImpl.java +++ b/ruoyi-modules/ruoyi-work/src/main/java/org/dromara/work/service/impl/TpOrderServiceImpl.java @@ -576,17 +576,17 @@ public class TpOrderServiceImpl extends MPJBaseServiceImpl 0){ + if(bo.getPrice().compareTo(order.getPayPrice().add(order.getCoupon())) > 0){ bo.setPayState(2); } } @@ -600,6 +600,18 @@ public class TpOrderServiceImpl extends MPJBaseServiceImpl 0; } + /** + * 修改订单信息 + * + * @param bo + * @return + */ + @Override + public Boolean updateInfoByBo(TpOrderBo bo) { + TpOrder update = MapstructUtils.convert(bo, TpOrder.class); + return baseMapper.updateById(update) > 0; + } + /** * 校验并批量删除订单管理信息 * @@ -779,7 +791,7 @@ public class TpOrderServiceImpl extends MPJBaseServiceImpl 0){ order.setPayState(2);