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 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