需求

src/main/java/com/gree/mall/miniapp/logic/goods/GoodsLogic.java

@@ -1,5 +1,6 @@
 package com.gree.mall.miniapp.logic.goods;
 
+import cn.binarywang.wx.miniapp.bean.live.WxMaLiveResult;
 import cn.hutool.core.bean.BeanUtil;
 import com.alibaba.excel.util.CollectionUtils;
 import com.aliyuncs.utils.StringUtils;
@@ -19,6 +20,7 @@ import com.gree.mall.miniapp.logic.common.WechatLogic;
 import com.gree.mall.miniapp.logic.seckill.SecKillLogic;
 import com.gree.mall.miniapp.plus.entity.*;
 import com.gree.mall.miniapp.plus.service.*;
+import com.gree.mall.miniapp.utils.StringUtil;
 import com.gree.mall.miniapp.utils.oss.OSSUtil;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -185,6 +187,34 @@ public class GoodsLogic {
         }
         //商品规格（包含秒杀商品）
         List<GoodsSpecSecBean> goodsSpecs = goodsSpecDetailMapper.querySpecSec(goodsId);
+
+        //替换商家价格
+        GoodsApply goodsApply = goodsApplyService.lambdaQuery()
+                .eq(GoodsApply::getGoodsId, goods.getGoodsId())
+                .eq(GoodsApply::getWebsitId, user.getWebsitId())
+                .eq(GoodsApply::getStatus, "OK")
+                .last("limit 1").one();
+        if (goodsApply != null){
+            List<GoodsApplyItem> goodsApplyItems =
+                    goodsApplyItemService.lambdaQuery()
+                    .eq(GoodsApplyItem::getGoodsApplyId, goodsApply.getGoodsApplyId())
+                    .list();
+
+            goods.setGoodsPrice(goodsApply.getGoodsPrice());
+            goods.setOrgGoodsPrice(goodsApply.getOrgGoodsPrice());
+
+            for (GoodsSpecSecBean goodsSpec : goodsSpecs) {
+                List<GoodsApplyItem> goodsApplyItemList = goodsApplyItems.stream().filter(item -> item.getGoodsSpecId().equals(goodsSpec.getGoodsSpecId()))
+                        .collect(Collectors.toList());
+
+                if (!CollectionUtils.isEmpty(goodsApplyItemList)){
+                    goodsSpec.setPrice(goodsApplyItemList.get(0).getApplyPrice());
+                    goodsSpec.setShareAmount(goodsApplyItemList.get(0).getApplyShareAmount());
+                    goodsSpec.setInnerShareAmount(goodsApplyItemList.get(0).getApplyInnerShareAmount());
+                }
+            }
+        }
+
         //是否有收藏
         Integer goodsFavoritesCount = goodsFavoriteService.lambdaQuery()
                 .eq(GoodsFavorite::getGoodsId, goodsId)

src/main/java/com/gree/mall/miniapp/logic/order/OrderLogic.java

@@ -10,6 +10,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.gree.mall.miniapp.bean.PayDetail;
 import com.gree.mall.miniapp.bean.coupon.UserCouponBean;
 import com.gree.mall.miniapp.bean.goods.AckGoodsBean;
+import com.gree.mall.miniapp.bean.goods.GoodsSpecSecBean;
 import com.gree.mall.miniapp.bean.order.*;
 import com.gree.mall.miniapp.bean.user.CurrentCompanyWechat;
 import com.gree.mall.miniapp.bean.user.ServiceWorkerBean;
@@ -144,6 +145,9 @@ public class OrderLogic {
     @Autowired
     GoodsApplyService goodsApplyService;
 
+    @Autowired
+    GoodsApplyItemService goodsApplyItemService;
+
 
     /**
      * 立即购买
@@ -231,11 +235,29 @@ public class OrderLogic {
             GoodsSpec goodsSpec = this.stock(buyGood.getGoodsSpecId(), goods.getGoodsName(), buyGood.getNum());
 
 
-            GoodsApply goodsApply = goodsApplyService.lambdaQuery().eq(GoodsApply::getGoodsId, buyGood.getGoodsId())
-                    .eq(GoodsApply::getWebsitId, currentCompanyWechat.getUser().getWebsitId())
+            //替换商家价格
+            GoodsApply goodsApply = goodsApplyService.lambdaQuery()
+                    .eq(GoodsApply::getGoodsId, goods.getGoodsId())
+                    .eq(GoodsApply::getWebsitId, user.getWebsitId())
                     .eq(GoodsApply::getStatus, "OK")
                     .last("limit 1").one();
-            if(goodsApply != null){
+            if (goodsApply != null){
+                List<GoodsApplyItem> goodsApplyItems =
+                        goodsApplyItemService.lambdaQuery()
+                                .eq(GoodsApplyItem::getGoodsApplyId, goodsApply.getGoodsApplyId())
+                                .list();
+
+                goods.setGoodsPrice(goodsApply.getGoodsPrice());
+                goods.setOrgGoodsPrice(goodsApply.getOrgGoodsPrice());
+
+
+                List<GoodsApplyItem> goodsApplyItemList = goodsApplyItems.stream().filter(item -> item.getGoodsSpecId().equals(goodsSpec.getGoodsSpecId()))
+                        .collect(Collectors.toList());
+                if (!CollectionUtils.isEmpty(goodsApplyItemList)){
+                    goodsSpec.setPrice(goodsApplyItemList.get(0).getApplyPrice());
+                    goodsSpec.setShareAmount(goodsApplyItemList.get(0).getApplyShareAmount());
+                    goodsSpec.setInnerShareAmount(goodsApplyItemList.get(0).getApplyInnerShareAmount());
+                }
 
             }