From d93bfd24a107032ec208eb386c7319d58174bb79 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=89=9B=E5=8F=89=E9=97=AA=E9=97=AA?= <18322780655@163.com> Date: Tue, 13 Aug 2024 14:30:22 +0800 Subject: [PATCH 1/4] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E8=8E=B7=E5=8F=96?= =?UTF-8?q?=E6=9C=80=E5=A4=A7=E6=8A=98=E6=89=A3=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../system/cashierservice/Shell.java | 2 -- .../controller/LoginContoller.java | 10 ++++++++++ .../cashierservice/service/LoginService.java | 20 +++++++++++++++++++ 3 files changed, 30 insertions(+), 2 deletions(-) diff --git a/src/main/java/com/chaozhanggui/system/cashierservice/Shell.java b/src/main/java/com/chaozhanggui/system/cashierservice/Shell.java index 4c1d29a..bb1fc4f 100644 --- a/src/main/java/com/chaozhanggui/system/cashierservice/Shell.java +++ b/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("=========================启动完成=========================="); }; } 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 dbf69bf..9cb87a2 100644 --- a/src/main/java/com/chaozhanggui/system/cashierservice/controller/LoginContoller.java +++ b/src/main/java/com/chaozhanggui/system/cashierservice/controller/LoginContoller.java @@ -51,4 +51,14 @@ 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); + + } } diff --git a/src/main/java/com/chaozhanggui/system/cashierservice/service/LoginService.java b/src/main/java/com/chaozhanggui/system/cashierservice/service/LoginService.java index 5e04407..90ed6ff 100644 --- a/src/main/java/com/chaozhanggui/system/cashierservice/service/LoginService.java +++ b/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); + + } } From e6402266290e8750eef8bfa4e40f4a3459fd5748 Mon Sep 17 00:00:00 2001 From: SongZhang <2064194730@qq.com> Date: Tue, 13 Aug 2024 14:36:16 +0800 Subject: [PATCH 2/4] =?UTF-8?q?1.=E6=8E=A8=E9=80=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../system/cashierservice/rabbit/ConsMsgConsumer.java | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/main/java/com/chaozhanggui/system/cashierservice/rabbit/ConsMsgConsumer.java b/src/main/java/com/chaozhanggui/system/cashierservice/rabbit/ConsMsgConsumer.java index 670d978..2715203 100644 --- a/src/main/java/com/chaozhanggui/system/cashierservice/rabbit/ConsMsgConsumer.java +++ b/src/main/java/com/chaozhanggui/system/cashierservice/rabbit/ConsMsgConsumer.java @@ -5,7 +5,6 @@ import cn.hutool.core.util.ObjectUtil; import cn.hutool.http.HttpRequest; import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSONObject; -import com.chaozhanggui.system.cashierservice.bean.ShopWxMsgTypeEnum; import com.chaozhanggui.system.cashierservice.dao.*; import com.chaozhanggui.system.cashierservice.entity.*; import com.chaozhanggui.system.cashierservice.util.*; @@ -123,7 +122,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 tbUserShopMsgs = shopOpenIdMapper.selectStateByShopIdAndType(product.getShopId(), ShopWxMsgTypeEnum.CONSUMABLES_MSG.getType()); + List tbUserShopMsgs = shopOpenIdMapper.selectByShopId(Integer.valueOf(product.getShopId())); log.info("待推送openId列表: {}", tbUserShopMsgs); if (Objects.nonNull(tbUserShopMsgs) && tbUserShopMsgs.size()>0) { tbUserShopMsgs.parallelStream().forEach(tbUserShopMsg->{ From b5bc0f2e0a58d994fcf9b7a0bb189c121b8688ba Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=89=9B=E5=8F=89=E9=97=AA=E9=97=AA?= <18322780655@163.com> Date: Wed, 14 Aug 2024 09:38:44 +0800 Subject: [PATCH 3/4] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=95=86=E5=93=81?= =?UTF-8?q?=E8=A7=84=E6=A0=BC=E5=8A=A0=E5=85=A5=E8=B4=AD=E7=89=A9=E8=BD=A6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/LoginContoller.java | 1 - .../cashierservice/service/OrderService.java | 47 +++++++++++++------ 2 files changed, 32 insertions(+), 16 deletions(-) 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 list = cashierCartMapper.selectALlByMasterId(masterId, "create"); From 780707e55cfa9c8993b2b248b16317574e8fcb5b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=89=9B=E5=8F=89=E9=97=AA=E9=97=AA?= <18322780655@163.com> Date: Wed, 14 Aug 2024 09:40:41 +0800 Subject: [PATCH 4/4] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=95=86=E5=93=81?= =?UTF-8?q?=E8=A7=84=E6=A0=BC=E5=8A=A0=E5=85=A5=E8=B4=AD=E7=89=A9=E8=BD=A6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../chaozhanggui/system/cashierservice/service/OrderService.java | 1 + 1 file changed, 1 insertion(+) 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 1f10b2e..3c8dfbe 100644 --- a/src/main/java/com/chaozhanggui/system/cashierservice/service/OrderService.java +++ b/src/main/java/com/chaozhanggui/system/cashierservice/service/OrderService.java @@ -173,6 +173,7 @@ public class OrderService { cashierCartMapper.updateByPrimaryKey(cashierCart); cashierCartMapper.deleteByPrimaryKey(cart.getId()); + cart=cashierCart; } }else { cart.setSkuId(skuId.toString());