Merge remote-tracking branch 'origin/dev' into zs

# Conflicts:
#	src/main/java/com/chaozhanggui/system/cashierservice/rabbit/ConsMsgConsumer.java

src/main/java/com/chaozhanggui/system/cashierservice/Shell.java

@@ -1,7 +1,6 @@
 package com.chaozhanggui.system.cashierservice;
 
 
-import com.chaozhanggui.system.cashierservice.task.ConsInfoTask;
 import lombok.extern.slf4j.Slf4j;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -45,7 +44,6 @@ public class Shell {
     @Bean
     public CommandLineRunner commandLineRunner(ApplicationContext ctx) {
         return (args) -> {
-//            ctx.getBean(ConsInfoTask.class).init();
             logger.info("=========================启动完成==========================");
         };
     }

src/main/java/com/chaozhanggui/system/cashierservice/controller/LoginContoller.java

@@ -51,4 +51,13 @@ public class LoginContoller {
                               @RequestHeader("clientType") String clientType){
         return loginService.getShopInfo(token);
     }
+
+
+    @RequestMapping(value = "getStaffDiscount")
+    public Result getStaffDiscount(@RequestHeader("token") String token,
+                                   @RequestHeader("loginName") String loginName,
+                                   @RequestHeader("clientType") String clientType){
+        return loginService.getStaffDiscount(token);
+
+    }
 }

src/main/java/com/chaozhanggui/system/cashierservice/rabbit/ConsMsgConsumer.java

@@ -123,7 +123,7 @@ public class ConsMsgConsumer {
             log.info("耗材名称: {}, conwarning:{},stockNumber:{}",tbConsInfo.getConName(),
                     tbConsInfo.getConWarning(),tbConsInfo.getStockNumber().subtract(tbConsInfo.getStockConsume()));
             if (N.egt(tbConsInfo.getConWarning(), tbConsInfo.getStockNumber().subtract(tbConsInfo.getStockConsume()))) {
-                List<TbUserShopMsg> tbUserShopMsgs = tbUserShopMsgMapper.selectAllByShopId(tbConsInfo.getShopId());
+                List<TbShopOpenId> tbUserShopMsgs = shopOpenIdMapper.selectStateByShopIdAndType(product.getShopId(), ShopWxMsgTypeEnum.CONSUMABLES_MSG.getType());
                 log.info("待推送openId列表: {}", tbUserShopMsgs);
                     if (Objects.nonNull(tbUserShopMsgs) && tbUserShopMsgs.size()>0) {
                         tbUserShopMsgs.parallelStream().forEach(tbUserShopMsg->{

src/main/java/com/chaozhanggui/system/cashierservice/service/LoginService.java

@@ -14,6 +14,7 @@ import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import java.math.BigDecimal;
 import java.util.Date;
 import java.util.Objects;
 import java.util.UUID;
@@ -191,4 +192,23 @@ public class LoginService {
 
         return Result.success(SUCCESS,shopInfo);
     }
+
+
+    public Result getStaffDiscount(String token){
+
+        JSONObject jsonObject=  TokenUtil.parseParamFromToken(token);
+        if(Objects.isNull(jsonObject)){
+            return Result.fail(CodeEnum.TOKENTERROR);
+        }
+
+        Integer staffId=Integer.valueOf(jsonObject.getString("staffId"));
+
+        TbPlussShopStaff staff= tbPlussShopStaffMapper.selectByPrimaryKey(staffId);
+        if(Objects.nonNull(staff)&&Objects.nonNull(staff.getMaxDiscountAmount())){
+            return Result.success(SUCCESS,staff.getMaxDiscountAmount());
+        }
+
+        return Result.success(SUCCESS, BigDecimal.ZERO);
+
+    }
 }

src/main/java/com/chaozhanggui/system/cashierservice/service/OrderService.java

@@ -162,6 +162,20 @@ public class OrderService {
 
         TbCashierCart cart = cashierCartMapper.selectByPrimaryKey(cartId);
         if (Objects.nonNull(cart)) {
+
+            //查询现有规格商品
+            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());
+                    cart=cashierCart;
+                }
+            }else {
                 cart.setSkuId(skuId.toString());
                 cart.setNumber(number);
                 cart.setIsGift(isGift);
@@ -180,6 +194,10 @@ public class OrderService {
                 cart.setTotalNumber(number);
                 cart.setUuid(uuid);
                 cashierCartMapper.updateByPrimaryKeySelective(cart);
+            }
+
+
+
 
         } else {
             List<TbCashierCart> list = StrUtil.isNotBlank(masterId) ? cashierCartMapper.selectALlByMasterId(masterId, "create")