From 06263cebbe9198e2693ab6d504db9d53afea8b71 Mon Sep 17 00:00:00 2001 From: cabbage <281119120@qq.com> Date: Tue, 1 Jul 2025 14:34:52 +0800 Subject: [PATCH 1/2] =?UTF-8?q?##=20=E4=B8=8B=E5=8D=95=E8=AE=A1=E7=AE=97?= =?UTF-8?q?=E7=AD=89=E7=BA=A7=E6=9F=A5=E8=AF=A2=E7=9B=92=E6=95=B0=E6=94=AF?= =?UTF-8?q?=E6=8C=81=E5=B0=8F=E6=95=B0=E5=A4=84=E7=90=86=EF=BC=9B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../sale/order/mapper/SaOrderItemsMapper.java | 16 ---------- .../order/service/ISaOrderItemsService.java | 12 ------- .../service/impl/SaOrderItemsServiceImpl.java | 5 --- .../mapper/sale/order/SaOrderItemsMapper.xml | 31 +------------------ 4 files changed, 1 insertion(+), 63 deletions(-) diff --git a/bd-business/bd-business-sale/src/main/java/com/hzs/sale/order/mapper/SaOrderItemsMapper.java b/bd-business/bd-business-sale/src/main/java/com/hzs/sale/order/mapper/SaOrderItemsMapper.java index d45385d3..f47c79d2 100644 --- a/bd-business/bd-business-sale/src/main/java/com/hzs/sale/order/mapper/SaOrderItemsMapper.java +++ b/bd-business/bd-business-sale/src/main/java/com/hzs/sale/order/mapper/SaOrderItemsMapper.java @@ -260,22 +260,6 @@ public interface SaOrderItemsMapper extends BaseMapper { */ List selectByWaresCodeList(@Param("orderCode") String orderCode); - /** - * 查询新零售购买指定商品数量 - * - * @param pkMember 会员ID - * @param waresCodeList 商品编号列表 - * @param payTime 支付时间（可为null） - * @param orderTypeList 订单类型列表 - * @param systemType 系统类型（可为null） - * @return - */ - int getRetailWaresQuantity(@Param("pkMember") Long pkMember, - @Param("waresCodeList") List waresCodeList, - @Param("payTime") Date payTime, - @Param("orderTypeList") List orderTypeList, - @Param("systemType") Integer systemType); - /** * 查询新零售购买指定商品数量（新） * diff --git a/bd-business/bd-business-sale/src/main/java/com/hzs/sale/order/service/ISaOrderItemsService.java b/bd-business/bd-business-sale/src/main/java/com/hzs/sale/order/service/ISaOrderItemsService.java index 6d9782f2..ff3d19e8 100644 --- a/bd-business/bd-business-sale/src/main/java/com/hzs/sale/order/service/ISaOrderItemsService.java +++ b/bd-business/bd-business-sale/src/main/java/com/hzs/sale/order/service/ISaOrderItemsService.java @@ -228,18 +228,6 @@ public interface ISaOrderItemsService extends IService { */ List selectByWaresCodeList(String orderCode); - /** - * 查询新零售购买指定商品数量 - * - * @param pkMember 会员ID - * @param waresCodeList 商品编号列表 - * @param payTime 支付时间（可为null） - * @param orderTypeList 订单类型列表 - * @param systemType 系统类型（可为null） - * @return - */ - int getRetailWaresQuantity(Long pkMember, List waresCodeList, Date payTime, List orderTypeList, Integer systemType); - /** * 查询新零售购买指定商品数量（新） * diff --git a/bd-business/bd-business-sale/src/main/java/com/hzs/sale/order/service/impl/SaOrderItemsServiceImpl.java b/bd-business/bd-business-sale/src/main/java/com/hzs/sale/order/service/impl/SaOrderItemsServiceImpl.java index cb083240..5b95d922 100644 --- a/bd-business/bd-business-sale/src/main/java/com/hzs/sale/order/service/impl/SaOrderItemsServiceImpl.java +++ b/bd-business/bd-business-sale/src/main/java/com/hzs/sale/order/service/impl/SaOrderItemsServiceImpl.java @@ -189,11 +189,6 @@ public class SaOrderItemsServiceImpl extends ServiceImpl waresCodeList, Date payTime, List orderTypeList, Integer systemType) { - return baseMapper.getRetailWaresQuantity(pkMember, waresCodeList, payTime, orderTypeList, systemType); - } - @Override public BigDecimal getRetailWaresQuantityNew(Long pkMember, List waresCodeList, Date payTime, List orderTypeList, Integer systemType) { return baseMapper.getRetailWaresQuantityNew(pkMember, waresCodeList, payTime, orderTypeList, systemType); diff --git a/bd-business/bd-business-sale/src/main/resources/mapper/sale/order/SaOrderItemsMapper.xml b/bd-business/bd-business-sale/src/main/resources/mapper/sale/order/SaOrderItemsMapper.xml index c13dadbb..9188de2e 100644 --- a/bd-business/bd-business-sale/src/main/resources/mapper/sale/order/SaOrderItemsMapper.xml +++ b/bd-business/bd-business-sale/src/main/resources/mapper/sale/order/SaOrderItemsMapper.xml @@ -1130,38 +1130,9 @@ and so.ORDER_CODE = #{orderCode} - - - - select cu_region_assess_detail_seq.nextval from dual connect by rownum <= #{rowNum} + select cu_region_assess_detail_seq.nextval + from dual connect by rownum <= #{rowNum} diff --git a/bd-business/bd-business-bonus/src/main/resources/mapper/bonus/detail/CuRegionAssessMapper.xml b/bd-business/bd-business-bonus/src/main/resources/mapper/bonus/detail/CuRegionAssessMapper.xml index c80c17d6..60e3a2bb 100644 --- a/bd-business/bd-business-bonus/src/main/resources/mapper/bonus/detail/CuRegionAssessMapper.xml +++ b/bd-business/bd-business-bonus/src/main/resources/mapper/bonus/detail/CuRegionAssessMapper.xml @@ -4,96 +4,119 @@ - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + - - - - - + + + + + + insert ALL - - into cu_region_assess(pk_id,pk_member,assess_period,pk_region,assess_start_date,assess_end_date, - source,pk_creator,pk_country) values - ( - #{item.pkId},#{item.pkMember},#{item.assessPeriod},#{item.pkRegion},#{item.assessStartDate},#{item.assessEndDate}, - #{item.source},#{item.pkCreator},#{item.pkCountry} - ) + + into cu_region_assess ( + pk_id, pk_member, assess_period, pk_region, + assess_start_date, assess_end_date, + source, pk_creator, pk_country) + values ( + #{item.pkId}, #{item.pkMember}, #{item.assessPeriod}, #{item.pkRegion}, + #{item.assessStartDate}, #{item.assessEndDate}, + #{item.source}, #{item.pkCreator}, #{item.pkCountry}) SELECT 1 FROM dual + merge into CU_REGION_ASSESS a - using( - select cd.pk_region_assess,sum(1) REACH_NUM from cu_region_assess_detail cd - inner join cu_region_assess ca - on cd.pk_region_assess=ca.pk_id - where cd.ASSESS_STATUS=0 and cd.del_flag=0 and ca.del_flag=0 - and ca.assess_start_date <= #{assessDate,jdbcType=DATE} - and ca.assess_end_date >= #{assessDate,jdbcType=DATE} + using ( + select cd.pk_region_assess, sum(1) REACH_NUM + from cu_region_assess_detail cd + inner join cu_region_assess ca + on cd.pk_region_assess = ca.pk_id + where cd.ASSESS_STATUS = 0 + and cd.del_flag = 0 + and ca.del_flag = 0 + and ca.assess_start_date <= #{assessDate,jdbcType=DATE} + and ca.assess_end_date >= #{assessDate,jdbcType=DATE} group by cd.pk_region_assess ) b - on (a.pk_id=b.pk_region_assess) + on (a.pk_id = b.pk_region_assess) when matched then - update set a.REACH_NUM=b.REACH_NUM + update set a.REACH_NUM = b.REACH_NUM + - update cu_region_assess set del_flag=1,modified_time=sysdate where pk_id in( - select ca.pk_id from cu_region_assess ca - inner join ( - select pk_id from cu_member_retail_region - where effective=0 and del_flag=0 - and nvl(modified_time,creation_time)>= #{assessStartDate,jdbcType=DATE} - and nvl(modified_time,creation_time) < #{assessEndDate,jdbcType=DATE} - ) b - on ca.pk_region =b.pk_id - where ca.del_flag=0 and ca.assess_start_date !=#{assessEndDate,jdbcType=DATE}) + update cu_region_assess + set del_flag = 1, + modified_time = sysdate + where pk_id in ( + select ca.pk_id + from cu_region_assess ca + inner join ( + select pk_id + from cu_member_retail_region + where effective = 0 + and del_flag = 0 + and nvl(modified_time, creation_time) >= #{assessStartDate,jdbcType=DATE} + and nvl(modified_time, creation_time) < #{assessEndDate,jdbcType=DATE} + ) b + on ca.pk_region = b.pk_id + where ca.del_flag = 0 + and ca.assess_start_date !=#{assessEndDate,jdbcType=DATE}) + delete from cu_region_assess where del_flag=0 and - assess_start_date=#{assessStartDate, jdbcType=DATE} + assess_start_date=#{assessStartDate, jdbcType=DATE} and assess_period=#{assessPeriod} and assess_period >= #{assessPeriod} + + + diff --git a/bd-business/bd-business-member/src/main/java/com/hzs/retail/member/provider/MemberRetailProvider.java b/bd-business/bd-business-member/src/main/java/com/hzs/retail/member/provider/MemberRetailProvider.java index dddd4b2e..8e78ffa0 100644 --- a/bd-business/bd-business-member/src/main/java/com/hzs/retail/member/provider/MemberRetailProvider.java +++ b/bd-business/bd-business-member/src/main/java/com/hzs/retail/member/provider/MemberRetailProvider.java @@ -10,11 +10,7 @@ import org.springframework.beans.factory.annotation.Autowired; import java.util.List; /** - * @Description: 新零售会员dubbo服务 - * @Author: jiang chao - * @Time: 2024/12/31 13:40 - * @Classname: MemberRetailProvider - * @PackageName: com.hzs.retail.member.provider + * 新零售会员dubbo服务 */ @Slf4j @DubboService diff --git a/bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/member/detail/CuRegionAssess.java b/bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/member/detail/CuRegionAssess.java index 1aad6248..251ceccf 100644 --- a/bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/member/detail/CuRegionAssess.java +++ b/bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/member/detail/CuRegionAssess.java @@ -2,7 +2,9 @@ package com.hzs.common.domain.member.detail; import com.baomidou.mybatisplus.annotation.KeySequence; import com.baomidou.mybatisplus.annotation.TableName; + import java.util.Date; + import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableField; import com.hzs.common.core.web.domain.BaseEntity; @@ -10,12 +12,7 @@ import lombok.*; import lombok.experimental.Accessors; /** - *

* 新零售会员区域考核 - *

- * - * @author hzs - * @since 2025-01-13 */ @Data @EqualsAndHashCode(callSuper = true) diff --git a/bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/member/detail/CuRegionAssessDetail.java b/bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/member/detail/CuRegionAssessDetail.java index 63cfa96a..c502d0db 100644 --- a/bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/member/detail/CuRegionAssessDetail.java +++ b/bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/member/detail/CuRegionAssessDetail.java @@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.annotation.TableName; import java.math.BigDecimal; import java.util.Date; + import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableField; import com.hzs.common.core.web.domain.BaseEntity; @@ -12,12 +13,7 @@ import lombok.*; import lombok.experimental.Accessors; /** - *

* 新零售会员区域考核明细表 - *

- * - * @author hzs - * @since 2025-01-13 */ @Data @EqualsAndHashCode(callSuper = true) @@ -56,7 +52,7 @@ public class CuRegionAssessDetail extends BaseEntity { private Date assessDate; /** - * 会员等级 + * 会员奖衔 */ @TableField("PK_AWARDS") private Integer pkAwards; diff --git a/bd-third/src/main/java/com/hzs/third/job/controller/JobTestController.java b/bd-third/src/main/java/com/hzs/third/job/controller/JobTestController.java index 72160a75..83b916fa 100644 --- a/bd-third/src/main/java/com/hzs/third/job/controller/JobTestController.java +++ b/bd-third/src/main/java/com/hzs/third/job/controller/JobTestController.java @@ -4,19 +4,20 @@ import cn.hutool.http.HttpUtil; import cn.hutool.json.JSONArray; import cn.hutool.json.JSONObject; import cn.hutool.json.JSONUtil; +import com.hzs.bonus.settle.IMemberSettleBonusApi; import com.hzs.common.core.domain.R; +import com.hzs.common.core.utils.DateUtils; 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; import lombok.extern.slf4j.Slf4j; import org.apache.dubbo.config.annotation.DubboReference; -import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; +import java.time.temporal.ChronoUnit; import java.util.*; /** @@ -32,6 +33,16 @@ public class JobTestController { @DubboReference IMemberJobServiceApi iMemberJobServiceApi; + @DubboReference + IMemberSettleBonusApi iMemberSettleBonusApi; + + + @GetMapping("/test-settle") + public AjaxResult testSettle() { + Date startDate = DateUtils.beforeDate(1, ChronoUnit.DAYS, DateUtils.currentDate()); + iMemberSettleBonusApi.autoCalculateBonus(startDate); + return AjaxResult.success(); + } /** * 测试行政区划更新