From 5610abd3f502757c2a72f0746f7505e09c4fdb1e Mon Sep 17 00:00:00 2001
From: Yen <yen1130@qq.com>
Date: Mon, 4 Sep 2023 11:07:34 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=AF=BC=E5=85=A5=E9=A2=84?=
 =?UTF-8?q?=E7=AE=97=E4=BF=AE=E6=94=B9=E9=87=91=E9=A2=9D=E5=BC=82=E5=B8=B8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../common/framework/mvc/HttpServletRequestFilter.java    | 2 +-
 .../modules/oms/controller/api/OmsShoppingCartApi.java    | 8 +++++++-
 .../modules/oms/entity/bo/OmsShoppingCartSaveBo.java      | 2 ++
 .../tbs/service/impl/TbsBudgetBatchServiceImpl.java       | 6 +++---
 4 files changed, 13 insertions(+), 5 deletions(-)

diff --git a/src/main/java/com/qs/serve/common/framework/mvc/HttpServletRequestFilter.java b/src/main/java/com/qs/serve/common/framework/mvc/HttpServletRequestFilter.java
index 18db5cc2..11ac0373 100644
--- a/src/main/java/com/qs/serve/common/framework/mvc/HttpServletRequestFilter.java
+++ b/src/main/java/com/qs/serve/common/framework/mvc/HttpServletRequestFilter.java
@@ -71,7 +71,7 @@ public class HttpServletRequestFilter implements Filter{
         }
         StringBuffer buffer = new StringBuffer("["+method+"] "+url);
         if(supplierId!=null){
-            buffer.append("供应商ID: "+supplierId);
+            buffer.append(" 供应商ID: "+supplierId);
         }
         if(!StringUtils.isEmpty(queryStr)){
             buffer.append("\n参数: "+queryStr);
diff --git a/src/main/java/com/qs/serve/modules/oms/controller/api/OmsShoppingCartApi.java b/src/main/java/com/qs/serve/modules/oms/controller/api/OmsShoppingCartApi.java
index 919a216b..9d33dbc9 100644
--- a/src/main/java/com/qs/serve/modules/oms/controller/api/OmsShoppingCartApi.java
+++ b/src/main/java/com/qs/serve/modules/oms/controller/api/OmsShoppingCartApi.java
@@ -98,6 +98,7 @@ public class OmsShoppingCartApi {
         }
         shoppingCart.setPicUrl(goodsSku.getPicUrl());
         shoppingCart.setSpuId(goodsSku.getSpuId());
+        shoppingCart.setAddPrice(goodsSku.getSalesPrice());
         GoodsSpu goodsSpu = goodsSpuService.getById(shoppingCart.getSpuId());
         if(!goodsSpu.getShelf().equals(1)){
             return R.error("商品已下架");
@@ -111,7 +112,12 @@ public class OmsShoppingCartApi {
         List<GoodsSkuSpecValueVo> skuSpecValues = goodsSkuSpecValueService.listSpecValueBySkuId(goodsSku.getId());
         String specInfo = skuSpecValues.stream().map(GoodsSkuSpecValueVo::getSpecValue).collect(Collectors.joining(";"));
         shoppingCart.setSpecInfo(specInfo);
-        omsShoppingCartService.save(shoppingCart);
+        if(param.getCartId()==null){
+            omsShoppingCartService.save(shoppingCart);
+        }else {
+            shoppingCart.setId(param.getCartId());
+            omsShoppingCartService.updateById(shoppingCart);
+        }
         return R.ok();
     }
 
diff --git a/src/main/java/com/qs/serve/modules/oms/entity/bo/OmsShoppingCartSaveBo.java b/src/main/java/com/qs/serve/modules/oms/entity/bo/OmsShoppingCartSaveBo.java
index 9f6894ca..f8abfe6b 100644
--- a/src/main/java/com/qs/serve/modules/oms/entity/bo/OmsShoppingCartSaveBo.java
+++ b/src/main/java/com/qs/serve/modules/oms/entity/bo/OmsShoppingCartSaveBo.java
@@ -14,6 +14,8 @@ import java.math.BigDecimal;
 @Data
 public class OmsShoppingCartSaveBo {
 
+    private Long cartId;
+
     /** 商品SKU */
     @NotNull(message = "商品SKU不能为空")
     private Long skuId;
diff --git a/src/main/java/com/qs/serve/modules/tbs/service/impl/TbsBudgetBatchServiceImpl.java b/src/main/java/com/qs/serve/modules/tbs/service/impl/TbsBudgetBatchServiceImpl.java
index 68e1b855..02b95d3b 100644
--- a/src/main/java/com/qs/serve/modules/tbs/service/impl/TbsBudgetBatchServiceImpl.java
+++ b/src/main/java/com/qs/serve/modules/tbs/service/impl/TbsBudgetBatchServiceImpl.java
@@ -389,12 +389,12 @@ public class TbsBudgetBatchServiceImpl extends ServiceImpl<TbsBudgetBatchMapper,
             }
             for (TbsBudgetBatchBo.BudgetAmount budgetAmount : scheduleAmountList) {
                 if(budgetAmount.getScheduleItemName().equals(itemBudget.getItemName())){
-                    boolean ne1 = ! itemBudget.getPreDispatchAmount().equals(budgetAmount.getPreDispatchAmount());
-                    boolean ne2 = ! realAmt.equals(budgetAmount.getBudgetAmount());
+                    boolean ne1 = ! (itemBudget.getPreDispatchAmount().compareTo(budgetAmount.getPreDispatchAmount())==0);
+                    boolean ne2 = ! (realAmt.compareTo(budgetAmount.getBudgetAmount())==0);
                     if(ne1 || ne2){
                         TbsBudgetChangeScheduleItem resultItem = TbsBudgetChangeScheduleItem.toNewObject(itemBudget);
                         resultItem.setChangeId(changeId);
-                        resultItem.setNewBudgetAmount(realAmt);
+                        resultItem.setNewBudgetAmount(budgetAmount.getBudgetAmount());
                         resultItem.setNewPreDispatchAmount(budgetAmount.getPreDispatchAmount());
                         changeScheduleItemList.add(resultItem);
                     }