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

bd-business/bd-business-member/src/main/java/com/hzs/member/account/provider/IMemberJobServiceProvider.java

@@ -6,6 +6,7 @@ import com.hzs.member.account.IMemberJobServiceApi;
 import com.hzs.member.account.service.ICuMemberAccountDetailService;
 import com.hzs.member.account.service.ICuMemberRechargeService;
 import com.hzs.member.account.service.ICuMemberWithdrawService;
+import com.hzs.member.base.mapper.DeleteGarbageDataMapper;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.dubbo.config.annotation.DubboService;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -35,6 +36,10 @@ public class IMemberJobServiceProvider implements IMemberJobServiceApi {
     @Autowired
     private ICuMemberRechargeService memberRechargeService;
 
+    @Autowired
+    private DeleteGarbageDataMapper deleteGarbageDataMapper;
+
+
     @Override
     public R insertAccountDetail() {
         try {
@@ -64,4 +69,12 @@ public class IMemberJobServiceProvider implements IMemberJobServiceApi {
        return R.ok(memberRechargeService.selectRechargeTotalAmount(startDate, endDate));
     }
 
+    @Override
+    public R autoDeleteGarbageData() {
+        deleteGarbageDataMapper.deleteMemberAwards(30);
+        deleteGarbageDataMapper.deleteMemberLevel(30);
+        deleteGarbageDataMapper.deleteMemberGrade(30);
+        return R.ok();
+    }
+
 }

bd-business/bd-business-member/src/main/java/com/hzs/member/base/mapper/DeleteGarbageDataMapper.java

@@ -0,0 +1,22 @@
+package com.hzs.member.base.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.hzs.common.domain.member.base.CuMemberAgent;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.Date;
+
+/**
+ * <p>
+ * 会员信息-代理商信息 Mapper 接口
+ * </p>
+ *
+ * @author hzs
+ * @since 2022-08-31
+ */
+public interface DeleteGarbageDataMapper extends BaseMapper {
+
+    void deleteMemberAwards(@Param("days") Integer days);
+    void deleteMemberLevel(@Param("days") Integer days);
+    void deleteMemberGrade(@Param("days") Integer days);
+}

bd-business/bd-business-member/src/main/resources/mapper/member/base/DeleteGarbageDataMapper.xml

@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.hzs.member.base.mapper.DeleteGarbageDataMapper">
+
+    <delete id="deleteMemberAwards" parameterType="java.lang.Integer">
+        delete from CU_MEMBER_AWARDS
+        where
+            CREATION_TIME <![CDATA[ < ]]> (SYSDATE - #{days})
+            and DEL_FLAG = 1
+    </delete>
+    <delete id="deleteMemberLevel" parameterType="java.lang.Integer">
+        delete from CU_MEMBER_AWARDS
+        where
+            CREATION_TIME <![CDATA[ < ]]> (SYSDATE - #{days})
+            and DEL_FLAG = 1
+    </delete>
+    <delete id="deleteMemberGrade" parameterType="java.lang.Integer">
+        delete from CU_MEMBER_AWARDS
+        where
+            CREATION_TIME <![CDATA[ < ]]> (SYSDATE - #{days})
+            and DEL_FLAG = 1
+    </delete>
+</mapper>

bd-third/src/main/java/com/hzs/third/job/CuMemberJob.java

@@ -34,4 +34,9 @@ public class CuMemberJob {
         iMemberJobServiceApi.automaticWithdrawal();
     }
 
+    @XxlJob("autoDeleteGarbageData")
+    public void autoDeleteGarbageData(){
+        iMemberJobServiceApi.autoDeleteGarbageData();
+    }
+
 }

bd-third/src/main/java/com/hzs/third/job/controller/JobTestController.java

@@ -6,6 +6,7 @@ import cn.hutool.json.JSONObject;
 import cn.hutool.json.JSONUtil;
 import com.hzs.common.core.domain.R;
 import com.hzs.common.core.web.domain.AjaxResult;
+import com.hzs.member.account.IMemberJobServiceApi;
 import com.hzs.system.base.IAreaServiceApi;
 import com.hzs.system.base.dto.AreaDTO;
 import com.hzs.third.job.OrderJob;
@@ -29,6 +30,9 @@ public class JobTestController {
     @DubboReference
     IAreaServiceApi iAreaServiceApi;
 
+    @DubboReference
+    IMemberJobServiceApi iMemberJobServiceApi;
+
     /**
      * 测试行政区划更新
      *
@@ -124,4 +128,10 @@ public class JobTestController {
         return AjaxResult.error("处理失败：" + resultR.getMsg());
     }
 
+
+    @GetMapping("/autoDeleteGarbageData")
+    public AjaxResult autoDeleteGarbageData() {
+        iMemberJobServiceApi.autoDeleteGarbageData();
+        return AjaxResult.success();
+    }
 }