From ba4220ed40c51442204841a8bb1fee85163040e6 Mon Sep 17 00:00:00 2001 From: wangfukang <15630117759@163.com> Date: Sat, 3 Aug 2024 10:18:24 +0800 Subject: [PATCH] =?UTF-8?q?=E5=AF=B9=E8=B4=A6=E5=8D=95=E5=A2=9E=E5=8A=A0?= =?UTF-8?q?=E5=88=A0=E9=99=A4=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/resources/application.yml | 8 ++--- hiver-admin/test-output/test-report.html | 16 +++++----- .../constant/DealingsRecordConstant.java | 4 +-- .../mall/bill/vo/CustomerBillSaleVo.java | 3 ++ .../mall/bill/vo/SupplierBillPurchaseVo.java | 3 ++ .../controller/DealingsRecordController.java | 26 ++++++++++++----- .../mall/dao/mapper/DealingsRecordMapper.java | 29 ++++++++++++++++++- .../mybatis/DealingsRecordService.java | 9 ++++++ .../mybatis/DealingsRecordServiceImpl.java | 19 ++++++++++-- .../resources/mapper/DealingsRecordMapper.xml | 27 ++++++++++++++--- 10 files changed, 114 insertions(+), 30 deletions(-) diff --git a/hiver-admin/src/main/resources/application.yml b/hiver-admin/src/main/resources/application.yml index dde87d6f..b423c524 100644 --- a/hiver-admin/src/main/resources/application.yml +++ b/hiver-admin/src/main/resources/application.yml @@ -25,8 +25,8 @@ spring: timeout-per-shutdown-phase: 10S # 数据源 datasource: -# url: jdbc:mysql://154.8.162.157:3306/hiver_shop?useUnicode=true&characterEncoding=utf-8&useSSL=false&serverTimezone=GMT%2B8&allowPublicKeyRetrieval=true&allowMultiQueries=true - url: jdbc:mysql://8.140.198.243:3306/hiver_shop?useUnicode=true&characterEncoding=utf-8&useSSL=false&serverTimezone=GMT%2B8&allowPublicKeyRetrieval=true&allowMultiQueries=true + url: jdbc:mysql://154.8.162.157:3306/hiver_shop?useUnicode=true&characterEncoding=utf-8&useSSL=false&serverTimezone=GMT%2B8&allowPublicKeyRetrieval=true&allowMultiQueries=true +# url: jdbc:mysql://8.140.198.243:3306/hiver_shop?useUnicode=true&characterEncoding=utf-8&useSSL=false&serverTimezone=GMT%2B8&allowPublicKeyRetrieval=true&allowMultiQueries=true username: reddoor # Jasypt加密 可到common-utils中找到JasyptUtil加解密工具类生成加密结果 格式为ENC(加密结果) 以下解密结果为123456 password: ENC(Zla4U4+yRLPhicvuX2TmiEgxEpzP4dk8BHzFDEtiEhwLQIIaftZrrEUJZce6efoe) @@ -67,8 +67,8 @@ spring: ddl-auto: update # Redis 若设有密码自行添加配置password redis: -# host: 154.8.162.157 - host: 8.140.198.243 + host: 154.8.162.157 +# host: 8.140.198.243 password: reddoor168 # 数据库索引 默认0 database: 1 diff --git a/hiver-admin/test-output/test-report.html b/hiver-admin/test-output/test-report.html index e157bf0b..f600fc08 100644 --- a/hiver-admin/test-output/test-report.html +++ b/hiver-admin/test-output/test-report.html @@ -35,7 +35,7 @@ Hiver
  • - 01, 2024 22:09:58 + 02, 2024 22:25:05
    • @@ -84,7 +84,7 @@

    passTest

    -

    22:09:59 / 0.019 secs

    +

    22:25:06 / 0.015 secs

    @@ -92,9 +92,9 @@
    #test-id=1
    passTest
    -08.01.2024 22:09:59 -08.01.2024 22:09:59 -0.019 secs +08.02.2024 22:25:06 +08.02.2024 22:25:06 +0.015 secs
    @@ -104,7 +104,7 @@ Pass - 22:09:59 + 22:25:06 Test passed @@ -128,13 +128,13 @@

    Started

    -

    01, 2024 22:09:58

    +

    02, 2024 22:25:05

    Ended

    -

    01, 2024 22:09:59

    +

    02, 2024 22:25:06

    diff --git a/hiver-core/src/main/java/cc/hiver/core/common/constant/DealingsRecordConstant.java b/hiver-core/src/main/java/cc/hiver/core/common/constant/DealingsRecordConstant.java index 7f609dcd..cc7a609f 100644 --- a/hiver-core/src/main/java/cc/hiver/core/common/constant/DealingsRecordConstant.java +++ b/hiver-core/src/main/java/cc/hiver/core/common/constant/DealingsRecordConstant.java @@ -13,8 +13,8 @@ public interface DealingsRecordConstant { Integer[] TYPE = {0, 1}; /** - * 交易类型：0:开单；1：退货(应该是没用到)；2：回款，3：新增客户/供应商欠款，4：充值；5：追加欠款;6:撤销订单;7:入库 + * 交易类型：0:开单；1：退货(应该是没用到)；2：回款，3：新增客户/供应商欠款，4：充值；5：追加欠款;6:撤销订单;7:入库；8：删除交易记录 */ - Integer[] DEALINGS_TYPE = {0, 1, 2, 3, 4, 5, 6,7}; + Integer[] DEALINGS_TYPE = {0, 1, 2, 3, 4, 5, 6, 7, 8}; } diff --git a/hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/bill/vo/CustomerBillSaleVo.java b/hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/bill/vo/CustomerBillSaleVo.java index 88edf545..07ee93ee 100644 --- a/hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/bill/vo/CustomerBillSaleVo.java +++ b/hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/bill/vo/CustomerBillSaleVo.java @@ -14,6 +14,9 @@ import java.util.List; @Data public class CustomerBillSaleVo { + @ApiModelProperty(value = "交易记录id") + private String id; + @ApiModelProperty(value = "销售单号") private String saleId; diff --git a/hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/bill/vo/SupplierBillPurchaseVo.java b/hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/bill/vo/SupplierBillPurchaseVo.java index 1aadba49..2e131800 100644 --- a/hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/bill/vo/SupplierBillPurchaseVo.java +++ b/hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/bill/vo/SupplierBillPurchaseVo.java @@ -14,6 +14,9 @@ import java.util.List; @Data public class SupplierBillPurchaseVo { + @ApiModelProperty(value = "交易记录id") + private String id; + @ApiModelProperty(value = "入库单号") private String purchaseId; diff --git a/hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/controller/DealingsRecordController.java b/hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/controller/DealingsRecordController.java index fa657ca1..c033c622 100644 --- a/hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/controller/DealingsRecordController.java +++ b/hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/controller/DealingsRecordController.java @@ -1,11 +1,9 @@ package cc.hiver.mall.controller; import cc.hiver.core.common.utils.ResultUtil; -import cc.hiver.core.common.utils.SecurityUtil; import cc.hiver.core.common.vo.Result; import cc.hiver.mall.entity.DealingsRecord; import cc.hiver.mall.service.mybatis.DealingsRecordService; -import cc.hiver.mall.service.mybatis.PurchaseService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import lombok.extern.slf4j.Slf4j; @@ -30,15 +28,9 @@ import java.util.List; @Transactional public class DealingsRecordController { - @Autowired - private PurchaseService purchaseService; - @Autowired private DealingsRecordService dealingsRecordService; - @Autowired - private SecurityUtil securityUtil; - @RequestMapping(value = "/save", method = RequestMethod.POST) @ApiOperation("新增采购单交易记录") public Result save(DealingsRecord dealingRecord) { @@ -77,4 +69,22 @@ public class DealingsRecordController { return new ResultUtil>().setData(dealingsRecords); } + /** + * 删除指定交易记录 + * + * @param id + * @return Result + * @author 王富康 + * @date 2024/8/2 + */ + @RequestMapping(value = "/deleteDealingsRecord", method = RequestMethod.POST) + @ApiOperation("删除交易记录") + public Result deleteDealingsRecord(String id) { + try { + dealingsRecordService.deleteDealingsRecord(id); + return ResultUtil.success("删除成功"); + } catch (Exception e) { + return ResultUtil.error("删除失败"); + } + } } diff --git a/hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/dao/mapper/DealingsRecordMapper.java b/hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/dao/mapper/DealingsRecordMapper.java index a54737c6..749e22e5 100644 --- a/hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/dao/mapper/DealingsRecordMapper.java +++ b/hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/dao/mapper/DealingsRecordMapper.java @@ -20,7 +20,7 @@ public interface DealingsRecordMapper extends BaseMapper { BigDecimal queryTotalPayAmount(@Param("shopId") String shopId, @Param("startTime") String startTime, @Param("endTime") String endTime); /** - * 根据用户id获取交易记录列表 + * 根据用户id获取交易记录列表(不分页) * * @param userId * @param shopId @@ -39,7 +39,34 @@ public interface DealingsRecordMapper extends BaseMapper { */ void cancelRecord(@Param("saleId") String saleId); + /** + * 分页获取客户交易记录 + * + * @param page + * @param customerBillQueryVo + * @return Page + * @author 王富康 + * @date 2024/8/2 + */ Page getDealingsRecordPageByUserId(Page page, @Param("customerBillQueryVo") CustomerBillQueryVo customerBillQueryVo); + /** + * 分页获取供应商交易记录 + * + * @param page + * @param supplierBillQueryVo + * @return Page + * @author 王富康 + * @date 2024/8/2 + */ Page getDealingsRecordPageBySupplierId(Page page, @Param("supplierBillQueryVo") SupplierBillQueryVo supplierBillQueryVo); + + /** + * 删除指定交易记录 + * + * @param id + * @author 王富康 + * @date 2024/8/2 + */ + void deleteDealingsRecord(@Param("id") String id); } \ No newline at end of file diff --git a/hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/service/mybatis/DealingsRecordService.java b/hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/service/mybatis/DealingsRecordService.java index 9e8a2e6e..4daba7b2 100644 --- a/hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/service/mybatis/DealingsRecordService.java +++ b/hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/service/mybatis/DealingsRecordService.java @@ -54,4 +54,13 @@ public interface DealingsRecordService extends IService { * @date 2024/7/6 */ Page getDealingsRecordPageBySupplierId(SupplierBillQueryVo supplierBillQueryVo); + + /** + * 删除指定交易记录 + * + * @param id + * @author 王富康 + * @date 2024/8/2 + */ + void deleteDealingsRecord(String id); } diff --git a/hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/serviceimpl/mybatis/DealingsRecordServiceImpl.java b/hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/serviceimpl/mybatis/DealingsRecordServiceImpl.java index 7361b933..3075c98d 100644 --- a/hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/serviceimpl/mybatis/DealingsRecordServiceImpl.java +++ b/hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/serviceimpl/mybatis/DealingsRecordServiceImpl.java @@ -51,9 +51,10 @@ public class DealingsRecordServiceImpl extends ServiceImpl getDealingsRecordPageByUserId(CustomerBillQueryVo customerBillQueryVo) { final Page page = new Page<>(customerBillQueryVo.getPageNum(), customerBillQueryVo.getPageSize()); - return dealingsRecordMapper.getDealingsRecordPageByUserId(page,customerBillQueryVo); + return dealingsRecordMapper.getDealingsRecordPageByUserId(page, customerBillQueryVo); } @Override public Page getDealingsRecordPageBySupplierId(SupplierBillQueryVo supplierBillQueryVo) { final Page page = new Page<>(supplierBillQueryVo.getPageNum(), supplierBillQueryVo.getPageSize()); - return dealingsRecordMapper.getDealingsRecordPageBySupplierId(page,supplierBillQueryVo); + return dealingsRecordMapper.getDealingsRecordPageBySupplierId(page, supplierBillQueryVo); + } + + /** + * 删除指定交易记录 + * + * @param id + * @author 王富康 + * @date 2024/8/2 + */ + @Override + public void deleteDealingsRecord(String id) { + dealingsRecordMapper.deleteDealingsRecord(id); } } diff --git a/hiver-modules/hiver-mall/src/main/resources/mapper/DealingsRecordMapper.xml b/hiver-modules/hiver-mall/src/main/resources/mapper/DealingsRecordMapper.xml index 8d9085ba..4256e923 100644 --- a/hiver-modules/hiver-mall/src/main/resources/mapper/DealingsRecordMapper.xml +++ b/hiver-modules/hiver-mall/src/main/resources/mapper/DealingsRecordMapper.xml @@ -104,7 +104,10 @@ select IFNULL(sum(amount),0.00) as totalPayAmount from t_dealings_record - where user_type ='1' + where + + del_flag != 2 + and user_type ='1' and shop_id = #{shopId} and create_time BETWEEN #{startTime} AND #{endTime} @@ -113,7 +116,10 @@ select from t_dealings_record - where shop_id = #{shopId} + where + + del_flag != 2 + and shop_id = #{shopId} and dealings_user_id = #{userId} order by create_time desc @@ -127,6 +133,7 @@ select + tdr.id, tdr.sale_id as purchase_id, tdr.create_by_name, tdr.create_time, @@ -182,7 +192,9 @@ t_dealings_record tdr left join t_purchase ts on ts.id = tdr.sale_id and ts.shop_id = #{supplierBillQueryVo.shopId} WHERE - tdr.dealings_user_id = #{supplierBillQueryVo.supplierId} + + tdr.del_flag != 2 + and tdr.dealings_user_id = #{supplierBillQueryVo.supplierId} and tdr.shop_id = #{supplierBillQueryVo.shopId} and (tdr.sale_id is null or ts.in_storage_status = '1') @@ -190,4 +202,11 @@ order by tdr.create_time asc + + + + update t_dealings_record + set del_flag = 2 + where id = #{id} + \ No newline at end of file