diff --git a/src/main/java/com/chaozhanggui/system/cashierservice/controller/LoginContoller.java b/src/main/java/com/chaozhanggui/system/cashierservice/controller/LoginContoller.java
index 9cb87a2..6dcab85 100644
--- a/src/main/java/com/chaozhanggui/system/cashierservice/controller/LoginContoller.java
+++ b/src/main/java/com/chaozhanggui/system/cashierservice/controller/LoginContoller.java
@@ -57,7 +57,6 @@ public class LoginContoller {
     public Result getStaffDiscount(@RequestHeader("token") String token,
                                    @RequestHeader("loginName") String loginName,
                                    @RequestHeader("clientType") String clientType){
-
         return loginService.getStaffDiscount(token);
 
     }
diff --git a/src/main/java/com/chaozhanggui/system/cashierservice/service/OrderService.java b/src/main/java/com/chaozhanggui/system/cashierservice/service/OrderService.java
index f056e3e..1f10b2e 100644
--- a/src/main/java/com/chaozhanggui/system/cashierservice/service/OrderService.java
+++ b/src/main/java/com/chaozhanggui/system/cashierservice/service/OrderService.java
@@ -162,24 +162,41 @@ public class OrderService {
         }
         TbCashierCart cart = cashierCartMapper.selectByPrimaryKey(cartId);
         if (Objects.nonNull(cart)) {
-            cart.setSkuId(skuId.toString());
-            cart.setNumber(number);
-            cart.setIsGift(isGift);
-            cart.setIsPack(isPack);
-            if (isPack.equals("false")){
-                cart.setPackFee(BigDecimal.ZERO);
+
+            //查询现有规格商品
+            if("edit".equals(type)&&!cart.getSkuId().equals(skuId.toString())){
+                TbCashierCart cashierCart = cashierCartMapper.selectByDetail(masterId, productId, shopId, skuId.toString(), DateUtils.getDay(), uuid);
+                if(Objects.nonNull(cashierCart)){
+                    cashierCart.setNumber(cashierCart.getNumber()+number);
+                    cashierCart.setTotalNumber(cashierCart.getNumber()+number);
+                    cashierCart.setUpdatedAt(System.currentTimeMillis());
+                    cashierCartMapper.updateByPrimaryKey(cashierCart);
+
+                    cashierCartMapper.deleteByPrimaryKey(cart.getId());
+                }
             }else {
-                cart.setPackFee(new BigDecimal(number).multiply(product.getPackFee()));
-            }
-            if (isGift.equals("false")) {
-                cart.setTotalAmount(new BigDecimal(number).multiply(skuWithBLOBs.getSalePrice()).add(cart.getPackFee()));
-            } else {
-                cart.setTotalAmount(BigDecimal.ZERO);
+                cart.setSkuId(skuId.toString());
+                cart.setNumber(number);
+                cart.setIsGift(isGift);
+                cart.setIsPack(isPack);
+                if (isPack.equals("false")){
+                    cart.setPackFee(BigDecimal.ZERO);
+                }else {
+                    cart.setPackFee(new BigDecimal(number).multiply(product.getPackFee()));
+                }
+                if (isGift.equals("false")) {
+                    cart.setTotalAmount(new BigDecimal(number).multiply(skuWithBLOBs.getSalePrice()).add(cart.getPackFee()));
+                } else {
+                    cart.setTotalAmount(BigDecimal.ZERO);
+                }
+
+                cart.setTotalNumber(number);
+                cart.setUuid(uuid);
+                cashierCartMapper.updateByPrimaryKeySelective(cart);
             }
 
-            cart.setTotalNumber(number);
-            cart.setUuid(uuid);
-            cashierCartMapper.updateByPrimaryKeySelective(cart);
+
+
 
         } else {
             List<TbCashierCart> list = cashierCartMapper.selectALlByMasterId(masterId, "create");