1.代课下单支持赠送

eladmin-system/src/main/java/cn/ysk/cashier/service/impl/shopimpl/TbShopTableServiceImpl.java

@@ -203,7 +203,7 @@ public class TbShopTableServiceImpl implements TbShopTableService {
 
 
     @Override
-    public void addCartForUser(AddCartDTO addCartDTO) {
+    public TbCashierCart addCartForUser(AddCartDTO addCartDTO) {
         TbProductSku productSku = productMapper.selectSkuByIdAndShopId(addCartDTO.getShopId(), addCartDTO.getSkuId());
         TbProduct product = productMapper.selectByIdAndShopId(addCartDTO.getShopId(), addCartDTO.getProductId());
 
@@ -248,6 +248,10 @@ public class TbShopTableServiceImpl implements TbShopTableService {
                 tbCashierCart.setTotalAmount(tbCashierCart.getTotalAmount().add(tbCashierCart.getPackFee()));
 
             }
+            tbCashierCart.setIsGift(String.valueOf(addCartDTO.isGift()));
+            if (addCartDTO.isGift()) {
+                tbCashierCart.setTotalAmount(BigDecimal.ZERO);
+            }
             tbCashierCart.setTotalNumber(addCartDTO.getNum());
             tbCashierCart.setNumber(addCartDTO.getNum());
             tbCashierCart.setCategoryId(product.getCategoryId());
@@ -258,12 +262,14 @@ public class TbShopTableServiceImpl implements TbShopTableService {
             // 数量0删除
             if (tbCashierCart.getNumber() == 0) {
                 cashierCartRepository.deleteById(tbCashierCart.getId());
-                return;
+                return null;
             }
             tbCashierCart.setUpdatedAt(DateUtil.current());
             tbCashierCart.setTotalAmount(new BigDecimal(addCartDTO.getNum()).multiply(productSku.getSalePrice()));
             cashierCartRepository.save(tbCashierCart);
         }
+
+        return tbCashierCart;
     }
 
     @Override

eladmin-system/src/main/java/cn/ysk/cashier/service/shop/TbShopTableService.java

@@ -98,7 +98,7 @@ public interface TbShopTableService {
     */
     void download(List<TbShopTableDto> all, HttpServletResponse response) throws IOException;
 
-    void addCartForUser(AddCartDTO addCartDTO);
+    TbCashierCart addCartForUser(AddCartDTO addCartDTO);
 
     void removeCart(RemoveCartDTO removeCartDTO);