From 9004bef525c1dbdc4326496c510d000cc90cbfeb Mon Sep 17 00:00:00 2001 From: cabbage <281119120@qq.com> Date: Wed, 9 Apr 2025 09:47:02 +0800 Subject: [PATCH] =?UTF-8?q?##=20=E5=86=99=E6=AD=BB6.4=E6=B1=87=E7=8E=87?= =?UTF-8?q?=E6=81=A2=E5=A4=8D=E6=88=901=EF=BC=9B=E6=B3=A8=E5=86=8C?= =?UTF-8?q?=E5=88=97=E8=A1=A8=E4=B8=9A=E7=BB=A9=E6=98=BE=E7=A4=BA=EF=BC=88?= =?UTF-8?q?7=EF=BC=89=EF=BC=9B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../member/achieve/CuMemberAchieveMapper.xml | 21 ++--- .../member/base/mapper/CuMemberMapper.java | 19 ---- .../member/base/service/ICuMemberService.java | 18 ---- .../service/impl/CuMemberServiceImpl.java | 13 --- .../controller/api/MarketNewsController.java | 54 +++++------ .../member/achieve/CuMemberAchieveMapper.xml | 21 ++--- .../mapper/member/base/CuMemberMapper.xml | 90 +++++++++---------- .../report/member/MemberReportMapper.xml | 40 ++++----- .../main/java/com/hzs/third/job/OrderJob.java | 2 +- 9 files changed, 105 insertions(+), 173 deletions(-) diff --git a/hzs-business/hzs-business-bonus/src/main/resources/mapper/member/achieve/CuMemberAchieveMapper.xml b/hzs-business/hzs-business-bonus/src/main/resources/mapper/member/achieve/CuMemberAchieveMapper.xml index 753a800d..fa4b59b0 100644 --- a/hzs-business/hzs-business-bonus/src/main/resources/mapper/member/achieve/CuMemberAchieveMapper.xml +++ b/hzs-business/hzs-business-bonus/src/main/resources/mapper/member/achieve/CuMemberAchieveMapper.xml @@ -639,20 +639,21 @@ a.r_rep_a_balance=0, a.r_rep_b_balance=0 + merge into ${tableName} a using (select #{period} period, a.* from (select user_id pk_member, - sum(CURR_DAY_MAIN_REG_AMOUNT) / 6.4 REGISTER_AMOUNT, - sum(CURR_DAY_MAIN_REG_PV) / 6.4 REGISTER_PV, - sum(CURR_DAY_MAIN_UP_AMOUNT) / 6.4 UPGRADE_AMOUNT, - sum(CURR_DAY_MAIN_UP_PV) / 6.4 UPGRADE_PV, - sum(CURR_DAY_MAIN_REPUR_AMOUNT) / 6.4 REPURCHASE_AMOUNT, - sum(CURR_DAY_MAIN_REPURCHASE_PV) / 6.4 REPURCHASE_PV, - sum(CURR_DAY_SEA2_REG_AMOUNT) / 6.4 HI_FUN_AMOUNT, - sum(CURR_DAY_SEA2_REG_PV) / 6.4 HI_FUN_PV, - sum(CURR_DAY_MALL_AMOUNT) / 6.4 MALL_AMOUNT, - sum(CURR_DAY_MALL_PV) / 6.4 MALL_PV + sum(CURR_DAY_MAIN_REG_AMOUNT) / 1 REGISTER_AMOUNT, + sum(CURR_DAY_MAIN_REG_PV) / 1 REGISTER_PV, + sum(CURR_DAY_MAIN_UP_AMOUNT) / 1 UPGRADE_AMOUNT, + sum(CURR_DAY_MAIN_UP_PV) / 1 UPGRADE_PV, + sum(CURR_DAY_MAIN_REPUR_AMOUNT) / 1 REPURCHASE_AMOUNT, + sum(CURR_DAY_MAIN_REPURCHASE_PV) / 1 REPURCHASE_PV, + sum(CURR_DAY_SEA2_REG_AMOUNT) / 1 HI_FUN_AMOUNT, + sum(CURR_DAY_SEA2_REG_PV) / 1 HI_FUN_PV, + sum(CURR_DAY_MALL_AMOUNT) / 1 MALL_AMOUNT, + sum(CURR_DAY_MALL_PV) / 1 MALL_PV from G_MEMBER_ACHIV@link_test where period between - 729 and #{period} group by user_id) a) b on diff --git a/hzs-business/hzs-business-member/src/main/java/com/hzs/member/base/mapper/CuMemberMapper.java b/hzs-business/hzs-business-member/src/main/java/com/hzs/member/base/mapper/CuMemberMapper.java index 4a716422..9d39d4b2 100644 --- a/hzs-business/hzs-business-member/src/main/java/com/hzs/member/base/mapper/CuMemberMapper.java +++ b/hzs-business/hzs-business-member/src/main/java/com/hzs/member/base/mapper/CuMemberMapper.java @@ -419,15 +419,6 @@ public interface CuMemberMapper extends BaseMapper { */ List queryMemberSelect(@Param("param") MemberSelectParam param, @Param("pkCountry") Integer pkCountry); - /** - * 查询手机号所包含用户（去重） - * - * @param phone 手机号 - * @param pkCountry 所属国家 - * @return - */ - List queryMemberNameListByPhone(@Param("phone") String phone, @Param("pkCountry") Integer pkCountry); - /* * description: 查询历史网体的最末安置人，左右区一起查出来 * @author: sui q @@ -681,16 +672,6 @@ public interface CuMemberMapper extends BaseMapper { */ List selectPlaceErrorCode(); - - /** - * 查询特殊会员列表 - * - * @param userName 会员名称 - * @param phone 联系方式 - * @return - */ - List querySpecialMemberList(@Param("userName") String userName, @Param("phone") String phone); - /* * @description: 查询伞下会员 * @author: sui q diff --git a/hzs-business/hzs-business-member/src/main/java/com/hzs/member/base/service/ICuMemberService.java b/hzs-business/hzs-business-member/src/main/java/com/hzs/member/base/service/ICuMemberService.java index a780c2a4..20966ef8 100644 --- a/hzs-business/hzs-business-member/src/main/java/com/hzs/member/base/service/ICuMemberService.java +++ b/hzs-business/hzs-business-member/src/main/java/com/hzs/member/base/service/ICuMemberService.java @@ -743,15 +743,6 @@ public interface ICuMemberService extends IService { */ CuMember confirmShareMemberByMemberParam(MemberParam memberParam); - /** - * 查询手机号所包含用户（去重） - * - * @param phone 手机号 - * @param pkCountry 所属国家 - * @return - */ - List queryMemberNameListByPhone(String phone, Integer pkCountry); - /** * 删除会员信息 * @@ -1036,15 +1027,6 @@ public interface ICuMemberService extends IService { */ List selectPlaceErrorCode(); - /** - * 查询特殊会员列表 - * - * @param userName 会员名称 - * @param phone 联系方式 - * @return - */ - List querySpecialMemberList(String userName, String phone); - /* * @description: 查询伞下会员 * @author: sui q diff --git a/hzs-business/hzs-business-member/src/main/java/com/hzs/member/base/service/impl/CuMemberServiceImpl.java b/hzs-business/hzs-business-member/src/main/java/com/hzs/member/base/service/impl/CuMemberServiceImpl.java index f5628fc3..1fb8d400 100644 --- a/hzs-business/hzs-business-member/src/main/java/com/hzs/member/base/service/impl/CuMemberServiceImpl.java +++ b/hzs-business/hzs-business-member/src/main/java/com/hzs/member/base/service/impl/CuMemberServiceImpl.java @@ -106,8 +106,6 @@ public class CuMemberServiceImpl extends ServiceImpl i @DubboReference IAwardsServiceApi awardsServiceApi; @DubboReference - IActivityServiceApi iActivityServiceApi; - @DubboReference ISystemConfigServiceApi systemConfigServiceApi; @Autowired @@ -3109,11 +3107,6 @@ public class CuMemberServiceImpl extends ServiceImpl i return placeCuMember; } - @Override - public List queryMemberNameListByPhone(String phone, Integer pkCountry) { - return baseMapper.queryMemberNameListByPhone(phone, pkCountry); - } - @Override public void deleteCuMemberByPkMember(Long pkMember, Long pkApprove, Date currentDateTime) { LambdaUpdateWrapper updateWrapper = new LambdaUpdateWrapper<>(); @@ -3830,12 +3823,6 @@ public class CuMemberServiceImpl extends ServiceImpl i return baseMapper.selectPlaceErrorCode(); } - - @Override - public List querySpecialMemberList(String userName, String phone) { - return baseMapper.querySpecialMemberList(userName, phone); - } - @Override public Boolean queryCuMemberUnderUmbrella(Long pkMember) { List cuMemberList = baseMapper.queryCuMemberUnderUmbrella(pkMember); diff --git a/hzs-business/hzs-business-member/src/main/java/com/hzs/member/marketnews/controller/api/MarketNewsController.java b/hzs-business/hzs-business-member/src/main/java/com/hzs/member/marketnews/controller/api/MarketNewsController.java index 09023fc0..a8a296ea 100644 --- a/hzs-business/hzs-business-member/src/main/java/com/hzs/member/marketnews/controller/api/MarketNewsController.java +++ b/hzs-business/hzs-business-member/src/main/java/com/hzs/member/marketnews/controller/api/MarketNewsController.java @@ -46,7 +46,7 @@ import java.util.function.Function; import java.util.stream.Collectors; /** - * @Description: + * @Description: 市场动态部分接口 * @Author: yuhui * @Time: 2023/1/13 16:38 * @Classname: MarketNewsController @@ -55,6 +55,7 @@ import java.util.stream.Collectors; @RestController @RequestMapping("/api/market-news") public class MarketNewsController extends BaseController { + @Autowired private ITransactionCommonService iTransactionCommonService; @Autowired @@ -63,27 +64,27 @@ public class MarketNewsController extends BaseController { private ICuMemberService memberService; @Autowired private ICuMemberBonusPushService memberBonusPushService; - @DubboReference - private IGradeServiceApi gradeServiceApi; - @DubboReference - private ICurrencyServiceApi currencyServiceApi; - @Autowired private ICuMemberBonusPushHisService cuMemberBonusPushHisService; + @DubboReference + IGradeServiceApi gradeServiceApi; + @DubboReference + ICurrencyServiceApi currencyServiceApi; + + /** * 招商列表 * * @return */ - @GetMapping("bidding-list") + @GetMapping("/bidding-list") public TableDataInfo biddingList(MarketNewsParam marketNewsParam) { Integer pkCountry = SecurityUtils.getPkCountry(); R> gradeDate = gradeServiceApi.queryGradeList(pkCountry); List gradeList = gradeDate.getData(); marketNewsParam.setPkCountry(pkCountry); - // marketNewsParam.setMemberCode(SecurityUtils.getMemberCode()); startPage(); List list = memberService.selectBiddingList(marketNewsParam); for (UserInvestmentVo userInvestmentVo : list) { @@ -100,8 +101,6 @@ public class MarketNewsController extends BaseController { //注册等级key if (userInvestmentVo.getPkRegisterGrade() != null) { - // Integer pkRegisterGrade=memberService.getGradeTranslateValue(userInvestmentVo.getPkRegisterGrade()); - // userInvestmentVo.setPkRegisterGrade(pkRegisterGrade); for (GradeDTO gradeDTO : gradeList) { if (gradeDTO.getPkId().equals(userInvestmentVo.getPkRegisterGrade())) { userInvestmentVo.setRegisterGradeVal(gradeDTO.getGradeName()); @@ -118,7 +117,7 @@ public class MarketNewsController extends BaseController { * * @return */ - @GetMapping("reg-list") + @GetMapping("/reg-list") public TableDataInfo regList(MarketNewsParam marketNewsParam) { Integer pkCountry = SecurityUtils.getPkCountry(); marketNewsParam.setPkCountry(pkCountry); @@ -127,7 +126,6 @@ public class MarketNewsController extends BaseController { List gradeList = gradeDate.getData(); R currencyDto = currencyServiceApi.getCurrency(SecurityUtils.getPkCountry()); CurrencyDTO currency = currencyDto.getData(); - // List list = memberService.selectBiddingList(marketNewsParam); if (marketNewsParam.getEndCreationTime() != null) { marketNewsParam.setEndCreationTime(DateUtils.getEndTime(marketNewsParam.getEndCreationTime())); } @@ -145,8 +143,6 @@ public class MarketNewsController extends BaseController { //注册等级key if (userInvestmentVo.getPkRegisterGrade() != null) { - // Integer pkRegisterGrade=memberService.getGradeTranslateValue(userInvestmentVo.getPkRegisterGrade()); - // userInvestmentVo.setPkRegisterGrade(pkRegisterGrade); for (GradeDTO gradeDTO : gradeList) { if (gradeDTO.getPkId().equals(userInvestmentVo.getPkRegisterGrade())) { userInvestmentVo.setRegisterGradeVal(gradeDTO.getGradeName()); @@ -174,7 +170,7 @@ public class MarketNewsController extends BaseController { /** * 海粉列表 */ - @GetMapping("sea_flour_list") + @GetMapping("/sea_flour_list") public TableDataInfo seaFlourList(SeaFlourParam seaFlourParam) { seaFlourParam.setPkMember(SecurityUtils.getUserId()); if (seaFlourParam.getStartCreationTime() != null) { @@ -191,7 +187,6 @@ public class MarketNewsController extends BaseController { seaFlourVo.setMemberName(CommonUtil.getMemberName(seaFlourVo.getPkVertex(), seaFlourVo.getMemberName(), seaFlourVo.getNickName())); } } - // List memberList = memberService.seaFlourList(seaFlourParam); return getDataTable(memberList); } @@ -201,7 +196,7 @@ public class MarketNewsController extends BaseController { @GetMapping("/round-his") public TableDataInfo seaFlourList() { List cuMemberBonusPushHis = cuMemberBonusPushHisService.queryCuMemberBonusPushHis(SecurityUtils.getUserId()); - if(Objects.equals(CountryConstants.CHINA_COUNTRY, SecurityUtils.getPkCountry())){ + if (Objects.equals(CountryConstants.CHINA_COUNTRY, SecurityUtils.getPkCountry())) { CurrencyDTO currencyDTO = currencyServiceApi.getCurrency(SecurityUtils.getPkCountry()).getData(); cuMemberBonusPushHis.forEach(bonusPushHis -> bonusPushHis.setCalAchieve(ComputeUtil.computeMultiply(bonusPushHis.getCalAchieve(), currencyDTO.getInExchangeRate()))); @@ -212,12 +207,11 @@ public class MarketNewsController extends BaseController { /** * 三单循环列表 */ - @GetMapping("triple_cycle_list") + @GetMapping("/triple_cycle_list") public TableDataInfo tripleCycleList(TripleCycleListParam tripleCycleListParam) { R currency = currencyServiceApi.getCurrency(SecurityUtils.getPkCountry()); // 汇率比例 BigDecimal inExchangeRate = currency.getData().getInExchangeRate(); - // R> gradeDto = gradeServiceApi.queryGradeList(SecurityUtils.getPkCountry()); R> gradeDto = gradeServiceApi.findAll(); List gradeDate = gradeDto.getData(); tripleCycleListParam.setPkMember(SecurityUtils.getUserId()); @@ -244,18 +238,15 @@ public class MarketNewsController extends BaseController { // 注册等级 if (cuMemberBonusPush.getPkRegisterGrade() != null) { if (cuMemberBonusPush.getPkRegisterGrade().equals(gradeDTO.getPkId())) { - // cuMemberBonusPush.setPkRegisterGradeStr(gradeDTO.getGradeName()); cuMemberBonusPush.setPkRegisterGradeStr(transactionMap1.get(gradeDTO.getPkTransaction())); } } } if (cuMemberBonusPush.getOrderType() != null) { - - // cuMemberBonusPush.setOrderTypeStr(EOrderType.getEnumByValue(cuMemberBonusPush.getOrderType()).getLabel()); cuMemberBonusPush.setOrderTypeStr(transactionMap.get(EnumsPrefixConstants.ORDER_TYPE + cuMemberBonusPush.getOrderType())); } - // 注册业绩 国内 * 6.4 - if (SecurityUtils.getPkCountry() == CountryConstants.CHINA_COUNTRY) { + // 注册业绩 国内 * 汇率 + if (SecurityUtils.getPkCountry().equals(CountryConstants.CHINA_COUNTRY)) { if (cuMemberBonusPush.getOrderAchieve() == null) { cuMemberBonusPush.setOrderAchieve(BigDecimal.ZERO); } @@ -282,21 +273,20 @@ public class MarketNewsController extends BaseController { /** * 三单循环获取下一轮次 */ - @GetMapping("next-round") - public AjaxResult nextRound(){ - // Integer pkCountry = SecurityUtils.getPkCountry(); + @GetMapping("/next-round") + public AjaxResult nextRound() { Long pkMember = SecurityUtils.getUserId(); CuMemberBonusPush memberBonusPush = memberBonusPushService.nextRound(pkMember); - if (memberBonusPush == null || memberBonusPush.getRound() == null || memberBonusPush.getSecond() == null){ + if (memberBonusPush == null || memberBonusPush.getRound() == null || memberBonusPush.getSecond() == null) { memberBonusPush.setSecond(1); memberBonusPush.setRound(1); } - if (memberBonusPush.getSecond().intValue() == 3){ + if (memberBonusPush.getSecond() == 3) { // 三单循环第三轮 memberBonusPush.setSecond(1); - memberBonusPush.setRound(memberBonusPush.getRound()+1); - }else { - memberBonusPush.setSecond(memberBonusPush.getSecond()+1); + memberBonusPush.setRound(memberBonusPush.getRound() + 1); + } else { + memberBonusPush.setSecond(memberBonusPush.getSecond() + 1); } return AjaxResult.success(memberBonusPush); } diff --git a/hzs-business/hzs-business-member/src/main/resources/mapper/member/achieve/CuMemberAchieveMapper.xml b/hzs-business/hzs-business-member/src/main/resources/mapper/member/achieve/CuMemberAchieveMapper.xml index 4346a2df..4010e480 100644 --- a/hzs-business/hzs-business-member/src/main/resources/mapper/member/achieve/CuMemberAchieveMapper.xml +++ b/hzs-business/hzs-business-member/src/main/resources/mapper/member/achieve/CuMemberAchieveMapper.xml @@ -712,20 +712,21 @@ a.r_rep_a_balance=0, a.r_rep_b_balance=0 + merge into ${tableName} a using (select #{period} period, a.* from (select user_id pk_member, - sum(CURR_DAY_MAIN_REG_AMOUNT) / 6.4 REGISTER_AMOUNT, - sum(CURR_DAY_MAIN_REG_PV) / 6.4 REGISTER_PV, - sum(CURR_DAY_MAIN_UP_AMOUNT) / 6.4 UPGRADE_AMOUNT, - sum(CURR_DAY_MAIN_UP_PV) / 6.4 UPGRADE_PV, - sum(CURR_DAY_MAIN_REPUR_AMOUNT) / 6.4 REPURCHASE_AMOUNT, - sum(CURR_DAY_MAIN_REPURCHASE_PV) / 6.4 REPURCHASE_PV, - sum(CURR_DAY_SEA2_REG_AMOUNT) / 6.4 HI_FUN_AMOUNT, - sum(CURR_DAY_SEA2_REG_PV) / 6.4 HI_FUN_PV, - sum(CURR_DAY_MALL_AMOUNT) / 6.4 MALL_AMOUNT, - sum(CURR_DAY_MALL_PV) / 6.4 MALL_PV + sum(CURR_DAY_MAIN_REG_AMOUNT) / 1 REGISTER_AMOUNT, + sum(CURR_DAY_MAIN_REG_PV) / 1 REGISTER_PV, + sum(CURR_DAY_MAIN_UP_AMOUNT) / 1 UPGRADE_AMOUNT, + sum(CURR_DAY_MAIN_UP_PV) / 1 UPGRADE_PV, + sum(CURR_DAY_MAIN_REPUR_AMOUNT) / 1 REPURCHASE_AMOUNT, + sum(CURR_DAY_MAIN_REPURCHASE_PV) / 1 REPURCHASE_PV, + sum(CURR_DAY_SEA2_REG_AMOUNT) / 1 HI_FUN_AMOUNT, + sum(CURR_DAY_SEA2_REG_PV) / 1 HI_FUN_PV, + sum(CURR_DAY_MALL_AMOUNT) / 1 MALL_AMOUNT, + sum(CURR_DAY_MALL_PV) / 1 MALL_PV from G_MEMBER_ACHIV@link_test where period between - 729 and #{period} group by user_id) a) b on diff --git a/hzs-business/hzs-business-member/src/main/resources/mapper/member/base/CuMemberMapper.xml b/hzs-business/hzs-business-member/src/main/resources/mapper/member/base/CuMemberMapper.xml index cc10acd1..9a00d476 100644 --- a/hzs-business/hzs-business-member/src/main/resources/mapper/member/base/CuMemberMapper.xml +++ b/hzs-business/hzs-business-member/src/main/resources/mapper/member/base/CuMemberMapper.xml @@ -193,18 +193,28 @@ - INSERT INTO CU_MEMBER (PK_ID, MEMBER_CODE, MEMBER_NAME, CATEGORY, CUSTOMER_TYPE, PHONE, EMAIL, ID_CARD, PK_SETTLE_COUNTRY, - PK_PARENT, PK_PLACE_PARENT, PLACE_DEPT, PK_TEAM_CODE, PK_CENTER_CODE, SOURCE, PK_REGISTER_GRADE, - PK_SETTLE_GRADE, PK_AWARDS, CONSUME_MONEY, CONSUME_ACHIEVE, PAY_STATUS, LOGIN_PWD, PAY_PWD, LOGIN_PASSWORD, PAY_PASSWORD, - PK_VERTEX, ACCOUNT_STATUS, ORDER_SOURCE, PK_CREATOR, CREATION_TIME, PK_COUNTRY, PAY_TIME, GLOBAL_CODE, COUNTRY_CODE, REGISTER_AUTHORITY, + INSERT INTO CU_MEMBER (PK_ID, MEMBER_CODE, MEMBER_NAME, CATEGORY, CUSTOMER_TYPE, PHONE, EMAIL, ID_CARD, + PK_SETTLE_COUNTRY, + PK_PARENT, PK_PLACE_PARENT, PLACE_DEPT, PK_TEAM_CODE, PK_CENTER_CODE, SOURCE, + PK_REGISTER_GRADE, + PK_SETTLE_GRADE, PK_AWARDS, CONSUME_MONEY, CONSUME_ACHIEVE, PAY_STATUS, LOGIN_PWD, + PAY_PWD, LOGIN_PASSWORD, PAY_PASSWORD, + PK_VERTEX, ACCOUNT_STATUS, ORDER_SOURCE, PK_CREATOR, CREATION_TIME, PK_COUNTRY, PAY_TIME, + GLOBAL_CODE, COUNTRY_CODE, REGISTER_AUTHORITY, EXPIRE_DATE, STOP_DATE, IS_MAKER_GIFT, MAKER_GIFT_TIME) - VALUES (#{pkId,jdbcType=INTEGER}, #{memberCode}, #{memberName}, #{category}, #{customerType}, #{phone}, #{email, jdbcType=VARCHAR}, #{idCard, jdbcType=VARCHAR}, #{pkSettleCountry}, - #{pkParent}, #{pkPlaceParent,jdbcType=NUMERIC}, #{placeDept,jdbcType=INTEGER}, #{pkTeamCode,jdbcType=INTEGER}, #{pkCenterCode,jdbcType=INTEGER}, #{source}, #{pkRegisterGrade}, - #{pkSettleGrade}, #{pkAwards}, #{consumeMoney,jdbcType=NUMERIC}, #{consumeAchieve,jdbcType=NUMERIC}, #{payStatus}, #{loginPwd}, #{payPwd}, + VALUES (#{pkId,jdbcType=INTEGER}, #{memberCode}, #{memberName}, #{category}, #{customerType}, #{phone}, + #{email, jdbcType=VARCHAR}, #{idCard, jdbcType=VARCHAR}, #{pkSettleCountry}, + #{pkParent}, #{pkPlaceParent,jdbcType=NUMERIC}, #{placeDept,jdbcType=INTEGER}, + #{pkTeamCode,jdbcType=INTEGER}, #{pkCenterCode,jdbcType=INTEGER}, #{source}, #{pkRegisterGrade}, + #{pkSettleGrade}, #{pkAwards}, #{consumeMoney,jdbcType=NUMERIC}, #{consumeAchieve,jdbcType=NUMERIC}, + #{payStatus}, #{loginPwd}, #{payPwd}, #{loginPassword}, #{payPassword}, #{pkVertex,jdbcType=INTEGER}, #{accountStatus}, #{orderSource}, - #{pkCreator,jdbcType=INTEGER}, #{creationTime, jdbcType=TIMESTAMP}, #{pkCountry}, #{payTime, jdbcType=TIMESTAMP}, - #{globalCode, jdbcType=VARCHAR}, #{countryCode, jdbcType=VARCHAR}, #{registerAuthority,jdbcType=INTEGER}, - #{expireDate, jdbcType=DATE}, #{stopDate, jdbcType=DATE}, #{isMakerGift,jdbcType=INTEGER}, #{makerGiftTime,jdbcType=TIMESTAMP}) + #{pkCreator,jdbcType=INTEGER}, #{creationTime, jdbcType=TIMESTAMP}, #{pkCountry}, + #{payTime, jdbcType=TIMESTAMP}, + #{globalCode, jdbcType=VARCHAR}, #{countryCode, jdbcType=VARCHAR}, + #{registerAuthority,jdbcType=INTEGER}, + #{expireDate, jdbcType=DATE}, #{stopDate, jdbcType=DATE}, #{isMakerGift,jdbcType=INTEGER}, + #{makerGiftTime,jdbcType=TIMESTAMP}) @@ -228,8 +238,10 @@ #{item.pkRegisterGrade}, #{item.pkSettleGrade}, #{item.pkAwards}, #{item.loginPwd}, #{item.payPwd}, #{item.loginPassword}, #{item.payPassword}, #{item.pkCreator}, #{item.creationTime}, #{item.payTime}, #{item.payStatus}, - #{item.pkTeamCode, jdbcType=NUMERIC}, #{item.pkVertex, jdbcType=NUMERIC}, #{item.orderSource}, #{item.consumeAchieve}, - #{item.globalCode, jdbcType=VARCHAR}, #{item.countryCode, jdbcType=VARCHAR}, #{item.expireDate, jdbcType=DATE}, #{item.stopDate, jdbcType=DATE} + #{item.pkTeamCode, jdbcType=NUMERIC}, #{item.pkVertex, jdbcType=NUMERIC}, #{item.orderSource}, + #{item.consumeAchieve}, + #{item.globalCode, jdbcType=VARCHAR}, #{item.countryCode, jdbcType=VARCHAR}, + #{item.expireDate, jdbcType=DATE}, #{item.stopDate, jdbcType=DATE} ) SELECT 1 FROM dual @@ -1655,17 +1667,6 @@ order by cm.creation_time desc - - - - select a.* from ( select cm.CONSUME_MONEY consumeMoney,cm.CONSUME_ACHIEVE consumeAchieve,cm.member_code memberCode,cm.member_name memberName,cm.PK_REGISTER_GRADE pkRegisterGrade, + select a.* from ( select cm.CONSUME_MONEY consumeMoney,cm.CONSUME_ACHIEVE consumeAchieve,cm.member_code + memberCode,cm.member_name memberName,cm.PK_REGISTER_GRADE pkRegisterGrade, cm.PK_SETTLE_GRADE pkSettleGrade, cm.CREATION_TIME creationTime, cm.pk_vertex, @@ -2069,7 +2072,8 @@ union all - select cm.CONSUME_MONEY consumeMoney,cm.CONSUME_ACHIEVE consumeAchieve,cm.member_code memberCode,cm.member_name memberName,cm.PK_REGISTER_GRADE pkRegisterGrade, + select cm.CONSUME_MONEY consumeMoney,cm.CONSUME_ACHIEVE consumeAchieve,cm.member_code memberCode,cm.member_name + memberName,cm.PK_REGISTER_GRADE pkRegisterGrade, cm.PK_SETTLE_GRADE pkSettleGrade, cm.CREATION_TIME creationTime, cm.pk_vertex, @@ -2078,9 +2082,11 @@ from CU_MEMBER cm where 1 = 1 and cm.DEL_FLAG = 0 and cm.pay_status=1 and cm.PK_SETTLE_GRADE = 1 and ( - (select count(so.PK_ID) from sa_order so where so.PK_MEMBER = cm.pk_id and so.DEL_FLAG = 0 and so.ORDER_STATUS = 1) > 0 + (select count(so.PK_ID) from sa_order so where so.PK_MEMBER = cm.pk_id and so.DEL_FLAG = 0 and so.ORDER_STATUS = + 1) > 0 or - (select count(sto.PK_ID) from sa_t_order sto where sto.PK_MEMBER = cm.pk_id and sto.DEL_FLAG = 0 and sto.ORDER_STATUS = 1) > 0 + (select count(sto.PK_ID) from sa_t_order sto where sto.PK_MEMBER = cm.pk_id and sto.DEL_FLAG = 0 and + sto.ORDER_STATUS = 1) > 0 ) and (cm.member_code=#{memberInfo} or cm.member_name=#{memberInfo}) @@ -2826,24 +2832,6 @@ having count(1) > 1 - - - - @@ -3227,7 +3216,8 @@ and cm.category = 0 and cm.pk_max_awards != 1 group by cm.member_name, cm.phone) tmp - on (cm.member_name = tmp.member_name and cm.phone = tmp.phone and cm.del_flag = 0 and cm.pk_settle_country = #{pkCountry} and cm.category = 0) + on (cm.member_name = tmp.member_name and cm.phone = tmp.phone and cm.del_flag = 0 and + cm.pk_settle_country = #{pkCountry} and cm.category = 0) WHEN MATCHED THEN update set cm.stop_date = add_months(cm.expire_date, 12), cm.modified_time = sysdate diff --git a/hzs-business/hzs-business-report/src/main/resources/mapper/report/member/MemberReportMapper.xml b/hzs-business/hzs-business-report/src/main/resources/mapper/report/member/MemberReportMapper.xml index 855b98ed..2616a37c 100644 --- a/hzs-business/hzs-business-report/src/main/resources/mapper/report/member/MemberReportMapper.xml +++ b/hzs-business/hzs-business-report/src/main/resources/mapper/report/member/MemberReportMapper.xml @@ -687,11 +687,11 @@ t6.rightSumPv, t6.leftSumPv, t2.dept, - t2.a_sum_pv * 6.4 historyLeftSumPv, - t2.b_sum_pv * 6.4 historyRightSumPv, + t2.a_sum_pv * 1 historyLeftSumPv, + t2.b_sum_pv * 1 historyRightSumPv, t6.pk_member - FROM (SELECT NVL(SUM(t1.a_new_pv) * 6.4, 0) leftSumPv, - NVL(SUM(t1.b_new_pv) * 6.4, 0) rightSumPv, + FROM (SELECT NVL(SUM(t1.a_new_pv) * 1, 0) leftSumPv, + NVL(SUM(t1.b_new_pv) * 1, 0) rightSumPv, t1.pk_member FROM ( @@ -746,12 +746,12 @@ bv.vertex_name vertexName, CASE WHEN t5.a_new_pv > t5.b_new_pv THEN - NVL(t5.b_new_pv * 6.4, 0) + NVL(t5.b_new_pv * 1, 0) WHEN t5.a_new_pv <= t5.b_new_pv THEN - NVL(t5.a_new_pv * 6.4, 0) + NVL(t5.a_new_pv * 1, 0) END achieve, - t5.a_new_pv * 6.4 leftSumPv, - t5.b_new_pv * 6.4 rightSumPv, + t5.a_new_pv * 1 leftSumPv, + t5.b_new_pv * 1 rightSumPv, CASE WHEN t5.a_new_pv > t5.b_new_pv THEN 2 @@ -801,8 +801,8 @@ ) t2 GROUP BY t2.pk_member) t3 ON t1.pk_id = t3.pk_member - WHERE t3.a_new_pv * 6.4 >= #{achieve} - AND t3.b_new_pv * 6.4 >= #{achieve}) t5 + WHERE t3.a_new_pv * 1 >= #{achieve} + AND t3.b_new_pv * 1 >= #{achieve}) t5 LEFT JOIN bd_awards a ON a.pk_id = t5.pk_awards AND a.pk_country = #{pkCountry} @@ -830,11 +830,11 @@ t6.rightSumPv, t6.leftSumPv, t2.dept, - t2.a_sum_pv * 6.4 historyLeftSumPv, - t2.b_sum_pv * 6.4 historyRightSumPv, + t2.a_sum_pv * 1 historyLeftSumPv, + t2.b_sum_pv * 1 historyRightSumPv, t6.pk_member - FROM (SELECT NVL(SUM(t1.a_new_pv) * 6.4, 0) leftSumPv, - NVL(SUM(t1.b_new_pv) * 6.4, 0) rightSumPv, + FROM (SELECT NVL(SUM(t1.a_new_pv) * 1, 0) leftSumPv, + NVL(SUM(t1.b_new_pv) * 1, 0) rightSumPv, t1.pk_member FROM ( @@ -886,12 +886,12 @@ bv.vertex_name vertexName, CASE WHEN t5.a_new_pv > t5.b_new_pv THEN - NVL(t5.b_new_pv * 6.4, 0) + NVL(t5.b_new_pv * 1, 0) WHEN t5.a_new_pv <= t5.b_new_pv THEN - NVL(t5.a_new_pv * 6.4, 0) + NVL(t5.a_new_pv * 1, 0) END achieve, - t5.a_new_pv * 6.4 leftSumPv, - t5.b_new_pv * 6.4 rightSumPv, + t5.a_new_pv * 1 leftSumPv, + t5.b_new_pv * 1 rightSumPv, CASE WHEN t5.a_new_pv > t5.b_new_pv THEN 2 @@ -941,8 +941,8 @@ ) t2 GROUP BY t2.pk_member) t3 ON t1.pk_id = t3.pk_member - WHERE t3.a_new_pv * 6.4 >= #{achieve} - AND t3.b_new_pv * 6.4 >= #{achieve}) t5 + WHERE t3.a_new_pv * 1 >= #{achieve} + AND t3.b_new_pv * 1 >= #{achieve}) t5 LEFT JOIN bd_awards a ON a.pk_id = t5.pk_awards AND a.pk_country = #{pkCountry} diff --git a/hzs-third/src/main/java/com/hzs/third/job/OrderJob.java b/hzs-third/src/main/java/com/hzs/third/job/OrderJob.java index ff0d115e..f9c3ae43 100644 --- a/hzs-third/src/main/java/com/hzs/third/job/OrderJob.java +++ b/hzs-third/src/main/java/com/hzs/third/job/OrderJob.java @@ -86,7 +86,7 @@ public class OrderJob { outRate = currencyDTO.getInExchangeRate(); currencyDtoMap.put(saOrderExt.getPkCountry(), currencyDTO); } - orderAmount = ComputeUtil.computeMultiply(ComputeUtil.computeDivide(orderAmount, outRate), 6.4); + orderAmount = ComputeUtil.computeMultiply(ComputeUtil.computeDivide(orderAmount, outRate), 1); } if (Objects.equals(EOrderType.REGISTER_ORDER.getValue(), saOrderExt.getOrderType()) || Objects.equals(EOrderType.SPECIAL_UPGRADE_ORDER.getValue(), saOrderExt.getOrderType())) {