对账单增加删除。

2 years ago · ba4220ed40
10 changed files with 114 additions and 30 deletions
--- 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
--- a/hiver-admin/test-output/test-report.html
+++ b/hiver-admin/test-output/test-report.html
@ -35,7 +35,7 @@
 <a href="#"><span class="badge badge-primary">Hiver</span></a>
 </li>
 <li class="m-r-10">
-<a href="#"><span class="badge badge-primary">八月 01, 2024 22:09:58</span></a>
+<a href="#"><span class="badge badge-primary">八月 02, 2024 22:25:05</span></a>
 </li>
 </ul>
 </div>
@ -84,7 +84,7 @@
          <div class="test-detail">
            <span class="meta text-white badge badge-sm"></span>
            <p class="name">passTest</p>
-            <p class="text-sm"><span>22:09:59 下午</span> / <span>0.019 secs</span></p>
+            <p class="text-sm"><span>22:25:06 下午</span> / <span>0.015 secs</span></p>
          </div>
          <div class="test-contents d-none">
 <div class="detail-head">
@ -92,9 +92,9 @@
 <div class="info">
 <div class='float-right'><span class='badge badge-default'>#test-id=1</span></div>
 <h5 class="test-status text-pass">passTest</h5>
-<span class='badge badge-success'>08.01.2024 22:09:59</span>
-<span class='badge badge-danger'>08.01.2024 22:09:59</span>
-<span class='badge badge-default'>0.019 secs</span>
+<span class='badge badge-success'>08.02.2024 22:25:06</span>
+<span class='badge badge-danger'>08.02.2024 22:25:06</span>
+<span class='badge badge-default'>0.015 secs</span>
 </div>
 <div class="m-t-10 m-l-5"></div>
 </div>
@ -104,7 +104,7 @@
  <tbody>
      <tr class="event-row">
        <td><span class="badge log pass-bg">Pass</span></td>
-        <td>22:09:59</td>
+        <td>22:25:06</td>
        <td>
          Test passed
        </td>
@ -128,13 +128,13 @@
 <div class="col-md-3">
 <div class="card"><div class="card-body">
 <p class="m-b-0">Started</p>
-<h3>八月 01, 2024 22:09:58</h3>
+<h3>八月 02, 2024 22:25:05</h3>
 </div></div>
 </div>
 <div class="col-md-3">
 <div class="card"><div class="card-body">
 <p class="m-b-0">Ended</p>
-<h3>八月 01, 2024 22:09:59</h3>
+<h3>八月 02, 2024 22:25:06</h3>
 </div></div>
 </div>
 <div class="col-md-3">
--- 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};

 }
--- 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;

--- 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;

--- 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<List<DealingsRecord>>().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("删除失败");
+        }
+    }
 }
--- 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<DealingsRecord> {
    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<DealingsRecord> {
     */
    void cancelRecord(@Param("saleId") String saleId);

+    /**
+     * 分页获取客户交易记录
+     *
+     * @param page
+     * @param customerBillQueryVo
+     * @return Page<CustomerBillSaleVo>
+     * @author 王富康
+     * @date 2024/8/2
+     */
    Page<CustomerBillSaleVo> getDealingsRecordPageByUserId(Page<CustomerBillSaleVo> page, @Param("customerBillQueryVo") CustomerBillQueryVo customerBillQueryVo);

+    /**
+     * 分页获取供应商交易记录
+     *
+     * @param page
+     * @param supplierBillQueryVo
+     * @return Page<SupplierBillPurchaseVo>
+     * @author 王富康
+     * @date 2024/8/2
+     */
    Page<SupplierBillPurchaseVo> getDealingsRecordPageBySupplierId(Page<SupplierBillPurchaseVo> page, @Param("supplierBillQueryVo") SupplierBillQueryVo supplierBillQueryVo);
+
+    /**
+     * 删除指定交易记录
+     *
+     * @param id
+     * @author 王富康
+     * @date 2024/8/2
+     */
+    void deleteDealingsRecord(@Param("id") String id);
 }
--- 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<DealingsRecord> {
     * @date 2024/7/6
     */
    Page<SupplierBillPurchaseVo> getDealingsRecordPageBySupplierId(SupplierBillQueryVo supplierBillQueryVo);
+
+    /**
+     * 删除指定交易记录
+     *
+     * @param id
+     * @author 王富康
+     * @date 2024/8/2
+     */
+    void deleteDealingsRecord(String id);
 }
--- 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<DealingsRecordMapper,

    /**
     * 作废交易记录
+     *
+     * @param saleId
     * @author 王富康
     * @date 2024/6/26
-     * @param saleId
     */
    @Override
    public void cancelRecord(String saleId) {
@ -72,4 +73,16 @@ public class DealingsRecordServiceImpl extends ServiceImpl<DealingsRecordMapper,
        return dealingsRecordMapper.getDealingsRecordPageBySupplierId(page, supplierBillQueryVo);
    }

+    /**
+     * 删除指定交易记录
+     *
+     * @param id
+     * @author 王富康
+     * @date 2024/8/2
+     */
+    @Override
+    public void deleteDealingsRecord(String id) {
+        dealingsRecordMapper.deleteDealingsRecord(id);
+    }
+
 }
--- 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
+        <!--20240802 排除掉删除的交易记录-->
+        del_flag != 2
+        and user_type ='1'
        and shop_id = #{shopId}
        and create_time BETWEEN #{startTime} AND #{endTime}
    </select>
@ -113,7 +116,10 @@
        select
        <include refid="Base_Column_List"/>
        from t_dealings_record
-        where  shop_id = #{shopId}
+        where
+        <!--20240802 排除掉删除的交易记录-->
+        del_flag != 2
+        and shop_id = #{shopId}
        and dealings_user_id = #{userId}
        order by create_time desc
    </select>
@ -127,6 +133,7 @@

    <select id="getDealingsRecordPageByUserId" resultType="cc.hiver.mall.bill.vo.CustomerBillSaleVo">
        select
+        tdr.id,
        tdr.sale_id,
        tdr.create_by_name,
        tdr.create_time,
@ -156,7 +163,9 @@
        n.sale_id
        ) trs on ts.id = trs.sale_id
        WHERE
-        tdr.dealings_user_id = #{customerBillQueryVo.customerId}
+            <!--20240802 排除掉删除的交易记录-->
+            tdr.del_flag != 2
+        and tdr.dealings_user_id = #{customerBillQueryVo.customerId}
        and tdr.shop_id = #{customerBillQueryVo.shopId}
        <if test='customerBillQueryVo.startDate !=null and customerBillQueryVo.endDate !=null'>
            and tdr.create_time BETWEEN #{customerBillQueryVo.startDate} AND #{customerBillQueryVo.endDate}
@ -166,6 +175,7 @@

    <select id="getDealingsRecordPageBySupplierId" resultType="cc.hiver.mall.bill.vo.SupplierBillPurchaseVo">
        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}
+        <!--20240802 排除掉删除的交易记录-->
+        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')
        <if test='supplierBillQueryVo.startDate !=null and supplierBillQueryVo.endDate !=null'>
@ -190,4 +202,11 @@
        </if>
        order by tdr.create_time asc
    </select>
+
+    <!-- cancelRecord-->
+    <update id="deleteDealingsRecord">
+        update t_dealings_record
+        set del_flag = 2
+        where id = #{id}
+    </update>
 </mapper>