diff --git a/Cpop-Mall/src/main/java/com/cpop/mall/business/service/impl/OrderRefundServiceImpl.java b/Cpop-Mall/src/main/java/com/cpop/mall/business/service/impl/OrderRefundServiceImpl.java index 757a52c..56a7282 100644 --- a/Cpop-Mall/src/main/java/com/cpop/mall/business/service/impl/OrderRefundServiceImpl.java +++ b/Cpop-Mall/src/main/java/com/cpop/mall/business/service/impl/OrderRefundServiceImpl.java @@ -132,7 +132,7 @@ public class OrderRefundServiceImpl extends ServiceImpl implements @Override public void inputLogisticsOrder(LogisticsOrderBo bo) { this.updateChain().setRaw(ORDER.PREVIOUS_STATUS, ORDER.ORDER_STATUS) - .set(ORDER.ORDER_STATUS, 3) + .set(ORDER.ORDER_STATUS, 2) .set(ORDER.LOGISTICS_ORDER, bo.getLogisticsOrder()) .where(ORDER.ID.eq(bo.getId())).update(); } diff --git a/Cpop-Mall/src/main/java/com/cpop/mall/business/service/impl/ProductServiceImpl.java b/Cpop-Mall/src/main/java/com/cpop/mall/business/service/impl/ProductServiceImpl.java index 999bbd0..63b90d6 100644 --- a/Cpop-Mall/src/main/java/com/cpop/mall/business/service/impl/ProductServiceImpl.java +++ b/Cpop-Mall/src/main/java/com/cpop/mall/business/service/impl/ProductServiceImpl.java @@ -347,7 +347,7 @@ public class ProductServiceImpl extends ServiceImpl impl .leftJoin("t_brand_info").as("tbi").on("tbi.id = tct.brand_id") .where("tbi.brand_id = ?", brandExtend.getBrandCloudId()) .or("tct.brand_id = ?", brandExtend.getBrandCloudId()) - .and("tct.pay_type = 0") + .like("tct.pay_type", 0) //未被删除的模板 .and("tct.deleted = 1") .orderBy("tct.creation_time", false));