Merge remote-tracking branch 'origin/Payment-Configuration' into Payment-Configuration

fs-service/src/main/java/com/fs/hisStore/service/impl/FsStoreCartScrmServiceImpl.java

@@ -207,6 +207,12 @@ public class FsStoreCartScrmServiceImpl implements IFsStoreCartScrmService
             else{
                 storeCart=cart.get(0);
                 int newCartNum = cartParam.getCartNum() + cart.get(0).getCartNum();
+                int stock=valueMapper.selectFsStoreProductStockById(storeCart.getProductAttrValueId());
+
+                if (newCartNum>stock){
+                    throw new CustomException("库存不足");
+                }
+
                 // 检查并调整限购数量（需要检查新的总数量）
                 Integer adjustedNewNum = adjustPurchaseLimit(uid, cartParam.getProductId(), newCartNum);
                 storeCart.setCartNum(adjustedNewNum);

fs-user-app/src/main/java/com/fs/app/controller/store/CompanyOrderNewScrmController.java

@@ -12,7 +12,6 @@ import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
-import javax.servlet.http.HttpServletRequest;
 
 @Api("销售订单")
 @RestController