mall/huimai
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/main-zhb'

Browse Source
This commit is contained in:
zhanghb
2025-02-18 14:02:32 +08:00
parent edb449a1ec 5b8eef7bd2
commit 2b5f4c3c5e
3 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
mall-dao/src/main/java/com/buy507/mall/mapper/OmsOrderMapper.java
View File

@@ -33,4 +33,4 @@ public interface OmsOrderMapper {
int updateByPrimaryKey(OmsOrder record);
PmsProduct selectPointsAreaStatus(@Param("orderSn") String orderSn);}
PmsProduct selectAll(@Param("orderSn") String orderSn);}

2
mall-dao/src/main/resources/com/buy507/mall/mapper/OmsOrderMapper.xml
View File

@@ -874,7 +874,7 @@
where id = #{id,jdbcType=BIGINT}
</update>
<select id="selectPointsAreaStatus" resultType="com.buy507.mall.model.PmsProduct">
<select id="selectAll" resultType="com.buy507.mall.model.PmsProduct">
SELECT p.id,
p.brand_id,
p.product_category_id,

2
mall-portal/src/main/java/com/buy507/mall/portal/service/impl/OmsPortalOrderServiceImpl.java
View File

@@ -1833,7 +1833,7 @@ public class OmsPortalOrderServiceImpl implements OmsPortalOrderService {
//获取订单实付金额
BigDecimal payAmount = order.getPayAmount();
//获取商品信息
PmsProduct pmsProduct = orderMapper.selectPointsAreaStatus(outTradeNo);
PmsProduct pmsProduct = orderMapper.selectAll(outTradeNo);
//如果是会员专区的商品则进行会员专区相对应的逻辑
if (pmsProduct.getVipStatus() == 1) {
//增加基金现金