CpopSZ/Cpop-Union
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

修复bug

Browse Source
This commit is contained in:
DB 2023-11-13 19:46:57 +08:00
parent 78f4ee135c
commit 1a4c3f95db
3 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Cpop-Mall/src/main/java/com/cpop/mall/business/service/impl/OrderRefundServiceImpl.java
View File

@ -132,7 +132,7 @@ public class OrderRefundServiceImpl extends ServiceImpl<OrderRefundMapper, Order
.set("user_id", userPoint.getOldUserId()) .set("user_id", userPoint.getOldUserId())
.set("brand_id", userPoint.getBrandCloudId()) .set("brand_id", userPoint.getBrandCloudId())
.set("point_behaviour", 9) .set("point_behaviour", 9)
.set("behaviour_record", "商城购买商品") .set("behaviour_record", "商城退款商品返回积分")
.set("point_change", order.getTotalPoint()) .set("point_change", order.getTotalPoint())
.set("point_time", now) .set("point_time", now)
.set("cumulative", userPoint.getTotalPoint() + order.getTotalPoint()) .set("cumulative", userPoint.getTotalPoint() + order.getTotalPoint())

2
Cpop-Mall/src/main/java/com/cpop/mall/business/service/impl/OrderServiceImpl.java
View File

@ -590,7 +590,7 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
@Override @Override
public void inputLogisticsOrder(LogisticsOrderBo bo) { public void inputLogisticsOrder(LogisticsOrderBo bo) {
this.updateChain().setRaw(ORDER.PREVIOUS_STATUS, ORDER.ORDER_STATUS) 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()) .set(ORDER.LOGISTICS_ORDER, bo.getLogisticsOrder())
.where(ORDER.ID.eq(bo.getId())).update(); .where(ORDER.ID.eq(bo.getId())).update();
} }

2
Cpop-Mall/src/main/java/com/cpop/mall/business/service/impl/ProductServiceImpl.java
View File

@ -347,7 +347,7 @@ public class ProductServiceImpl extends ServiceImpl<ProductMapper, Product> impl
.leftJoin("t_brand_info").as("tbi").on("tbi.id = tct.brand_id") .leftJoin("t_brand_info").as("tbi").on("tbi.id = tct.brand_id")
.where("tbi.brand_id = ?", brandExtend.getBrandCloudId()) .where("tbi.brand_id = ?", brandExtend.getBrandCloudId())
.or("tct.brand_id = ?", brandExtend.getBrandCloudId()) .or("tct.brand_id = ?", brandExtend.getBrandCloudId())
.and("tct.pay_type = 0") .like("tct.pay_type", 0)
//未被删除的模板 //未被删除的模板
.and("tct.deleted = 1") .and("tct.deleted = 1")
.orderBy("tct.creation_time", false)); .orderBy("tct.creation_time", false));