From a2bd783a21cbe8e12e2e33c6962bb71f021bb762 Mon Sep 17 00:00:00 2001 From: 19991905653 Date: Wed, 3 Apr 2024 11:36:00 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=BA=A4=E7=8F=AD?= =?UTF-8?q?=E8=90=BD=E5=9C=B0=E6=95=B0=E6=8D=AE=E9=80=BB=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cashierservice/entity/TbOrderDetail.java | 1 + .../cashierservice/service/DutyService.java | 6 ++-- .../resources/mapper/TbOrderDetailMapper.xml | 28 +++++++++++-------- 3 files changed, 20 insertions(+), 15 deletions(-) diff --git a/src/main/java/com/chaozhanggui/system/cashierservice/entity/TbOrderDetail.java b/src/main/java/com/chaozhanggui/system/cashierservice/entity/TbOrderDetail.java index 0d01cd3..f190219 100644 --- a/src/main/java/com/chaozhanggui/system/cashierservice/entity/TbOrderDetail.java +++ b/src/main/java/com/chaozhanggui/system/cashierservice/entity/TbOrderDetail.java @@ -19,6 +19,7 @@ public class TbOrderDetail implements Serializable { private Integer productSkuId; private Integer num; + private Integer returnNum; private String productName; private String status; diff --git a/src/main/java/com/chaozhanggui/system/cashierservice/service/DutyService.java b/src/main/java/com/chaozhanggui/system/cashierservice/service/DutyService.java index d3ca714..68800ee 100644 --- a/src/main/java/com/chaozhanggui/system/cashierservice/service/DutyService.java +++ b/src/main/java/com/chaozhanggui/system/cashierservice/service/DutyService.java @@ -70,11 +70,11 @@ public class DutyService { ShopUserDuty shopUserDuty = shopUserDutyMapper.selectByShopIdAndTrade(shopId,day); // ShopUserDuty shopUserDuty = shopUserDutyMapper.selectByTokenIdAndTradeDay(tokenId, day, orderInfo.getShopId()); BigDecimal cashAmount = BigDecimal.ZERO; - if (orderInfo.getPayType().equals("cash")) { - cashAmount = orderInfo.getPayAmount(); - } if (type.equals("create")) { + if (orderInfo.getPayType().equals("cash")) { + cashAmount = orderInfo.getPayAmount(); + } if (Objects.isNull(shopUserDuty)) { shopUserDuty = new ShopUserDuty(userId, tbToken.getCreateTime(), 1, orderInfo.getOrderAmount(), loginName, "0", orderInfo.getOrderAmount(), shopId, BigDecimal.ZERO, cashAmount, BigDecimal.ZERO, ""); diff --git a/src/main/resources/mapper/TbOrderDetailMapper.xml b/src/main/resources/mapper/TbOrderDetailMapper.xml index 353eea3..ddfb2d1 100644 --- a/src/main/resources/mapper/TbOrderDetailMapper.xml +++ b/src/main/resources/mapper/TbOrderDetailMapper.xml @@ -8,6 +8,7 @@ + @@ -20,7 +21,7 @@ id, order_id, shop_id, product_id, product_sku_id, num, product_name, product_sku_name, - product_img, create_time, update_time, price, price_amount,status,pack_amount + product_img, create_time, update_time, price, price_amount,status,pack_amount,return_num select * from tb_order_detail where status='closed' and order_id=#{orderId} and id in @@ -230,10 +234,10 @@ insert into tb_order_detail (order_id, shop_id, - product_id, product_sku_id, num, - product_name, product_sku_name, product_img, - create_time, update_time, price, - price_amount,pack_amount,status) values + product_id, product_sku_id, num, + product_name, product_sku_name, product_img, + create_time, update_time, price, + price_amount,pack_amount,status) values (#{orderId},#{item.shopId},#{item.productId},#{item.productSkuId},#{item.num},#{item.productName},#{item.productSkuName},#{item.productImg},#{item.createTime},#{item.updateTime},#{item.price},#{item.priceAmount},#{item.packAmount},#{item.status}) From 3f95f15775f3048b95edbdcb1eadc7385296b45d Mon Sep 17 00:00:00 2001 From: wangw <1594593906@qq.com> Date: Wed, 3 Apr 2024 11:39:57 +0800 Subject: [PATCH 2/2] =?UTF-8?q?PC=E6=89=93=E5=8D=B0=E6=9C=BA=E5=88=97?= =?UTF-8?q?=E8=A1=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../TbPrintPCMachineController.java | 2 +- .../service/TbPrintPCMachineService.java | 41 ++++++++++++------- 2 files changed, 28 insertions(+), 15 deletions(-) diff --git a/src/main/java/com/chaozhanggui/system/cashierservice/controller/TbPrintPCMachineController.java b/src/main/java/com/chaozhanggui/system/cashierservice/controller/TbPrintPCMachineController.java index 016d939..cba3b75 100644 --- a/src/main/java/com/chaozhanggui/system/cashierservice/controller/TbPrintPCMachineController.java +++ b/src/main/java/com/chaozhanggui/system/cashierservice/controller/TbPrintPCMachineController.java @@ -34,7 +34,7 @@ public class TbPrintPCMachineController { */ @GetMapping public Result queryByPage(TbPrintPCMachine tbPrintMachine) { - return this.tbPrintPCMachineService.queryByPage(tbPrintMachine); + return tbPrintPCMachineService.queryByPage(tbPrintMachine); } /** diff --git a/src/main/java/com/chaozhanggui/system/cashierservice/service/TbPrintPCMachineService.java b/src/main/java/com/chaozhanggui/system/cashierservice/service/TbPrintPCMachineService.java index 6c2ebb9..a231191 100644 --- a/src/main/java/com/chaozhanggui/system/cashierservice/service/TbPrintPCMachineService.java +++ b/src/main/java/com/chaozhanggui/system/cashierservice/service/TbPrintPCMachineService.java @@ -18,6 +18,7 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import java.time.Instant; +import java.util.ArrayList; import java.util.List; /** @@ -41,15 +42,15 @@ public class TbPrintPCMachineService { public Result queryById(Integer id) { TbPrintPCMachine tbPrintMachine = tbPrintMachineMapper.queryById(id); - if(tbPrintMachine==null){ + if (tbPrintMachine == null) { return Result.fail("数据不存在"); } - PrintMachineDto tbPrintMachineVO=new PrintMachineDto(); - if (StringUtils.isNotBlank(tbPrintMachine.getConfig())){ + PrintMachineDto tbPrintMachineVO = new PrintMachineDto(); + if (StringUtils.isNotBlank(tbPrintMachine.getConfig())) { tbPrintMachineVO.setConfig(JSON.parseObject(tbPrintMachine.getConfig(), PrintConfig.class)); } - BeanUtils.copyProperties(tbPrintMachine,tbPrintMachineVO); - return Result.success(CodeEnum.SUCCESS,tbPrintMachineVO); + BeanUtils.copyProperties(tbPrintMachine, tbPrintMachineVO); + return Result.success(CodeEnum.SUCCESS, tbPrintMachineVO); } /** @@ -62,8 +63,20 @@ public class TbPrintPCMachineService { PageHelper.startPage(tbPrintMachine.getPage(), tbPrintMachine.getPageSize()); tbPrintMachine.setContentType("local"); List tbPrintMachines = this.tbPrintMachineMapper.queryAll(tbPrintMachine); - PageInfo pageInfo=new PageInfo(tbPrintMachines); - return Result.success(CodeEnum.SUCCESS,pageInfo); + + List printMachineList = new ArrayList<>(); + for (TbPrintPCMachine printMachine : tbPrintMachines) { + PrintMachineDto tbPrintMachineVO = new PrintMachineDto(); + if (StringUtils.isNotBlank(printMachine.getConfig())) { + tbPrintMachineVO.setConfig(JSON.parseObject(printMachine.getConfig(), PrintConfig.class)); + } + BeanUtils.copyProperties(printMachine, tbPrintMachineVO); + printMachineList.add(tbPrintMachineVO); + } + + PageInfo pageInfo = new PageInfo(tbPrintMachines); + pageInfo.setList(printMachineList); + return Result.success(CodeEnum.SUCCESS, pageInfo); } /** @@ -76,13 +89,13 @@ public class TbPrintPCMachineService { TbPrintPCMachine tbPrintMachine = new TbPrintPCMachine(); tbPrintMachine.setCreatedAt(Instant.now().toEpochMilli()); tbPrintMachine.setContentType("local"); - if (resources.getConfig() != null){ - if(CollectionUtils.isEmpty(resources.getConfig().getCategoryList())){ + if (resources.getConfig() != null) { + if (CollectionUtils.isEmpty(resources.getConfig().getCategoryList())) { resources.getConfig().setCategoryList(null); } - tbPrintMachine.setConfig(JSONUtil.toJSONString(resources.getConfig(),true)); + tbPrintMachine.setConfig(JSONUtil.toJSONString(resources.getConfig(), true)); } - BeanUtils.copyProperties(resources,tbPrintMachine); + BeanUtils.copyProperties(resources, tbPrintMachine); tbPrintMachineMapper.insert(tbPrintMachine); return Result.success(CodeEnum.SUCCESS); } @@ -96,10 +109,10 @@ public class TbPrintPCMachineService { public Result update(PrintMachineDto resources) { TbPrintPCMachine tbPrintMachine = new TbPrintPCMachine(); tbPrintMachine.setUpdatedAt(Instant.now().toEpochMilli()); - if (resources.getConfig() != null){ - tbPrintMachine.setConfig(JSONUtil.toJSONString(resources.getConfig(),true)); + if (resources.getConfig() != null) { + tbPrintMachine.setConfig(JSONUtil.toJSONString(resources.getConfig(), true)); } - BeanUtils.copyProperties(resources,tbPrintMachine); + BeanUtils.copyProperties(resources, tbPrintMachine); tbPrintMachineMapper.update(tbPrintMachine); return Result.success(CodeEnum.SUCCESS); }