diff --git a/bd-business/bd-business-member/src/main/java/com/hzs/member/statis/service/impl/MemberStatisticsServiceImpl.java b/bd-business/bd-business-member/src/main/java/com/hzs/member/statis/service/impl/MemberStatisticsServiceImpl.java index 66f5c870..bbe5a734 100644 --- a/bd-business/bd-business-member/src/main/java/com/hzs/member/statis/service/impl/MemberStatisticsServiceImpl.java +++ b/bd-business/bd-business-member/src/main/java/com/hzs/member/statis/service/impl/MemberStatisticsServiceImpl.java @@ -74,7 +74,7 @@ public class MemberStatisticsServiceImpl implements IMemberStatisticsService { for (DirectStatisticsTop30VO directStatisticsTop30VO : result) { if(param.getFaker()){ directStatisticsTop30VO.setMemberCode(DataMaskingUtil.mask(directStatisticsTop30VO.getMemberCode(), 2, 2)); - directStatisticsTop30VO.setMemberName(DataMaskingUtil.mask(directStatisticsTop30VO.getMemberName(), 1, 0)); + directStatisticsTop30VO.setMemberName(DataMaskingUtil.mask(directStatisticsTop30VO.getMemberName(), 1, 0, 6)); } directStatisticsTop30VO.setNumberOfAmount(directStatisticsTop30VO.getNumberOfAmount().divide(new BigDecimal(10000))); } diff --git a/bd-business/bd-business-member/src/main/resources/mapper/member/statis/MemberStatisticsMapper.xml b/bd-business/bd-business-member/src/main/resources/mapper/member/statis/MemberStatisticsMapper.xml index e854266c..05233d8c 100644 --- a/bd-business/bd-business-member/src/main/resources/mapper/member/statis/MemberStatisticsMapper.xml +++ b/bd-business/bd-business-member/src/main/resources/mapper/member/statis/MemberStatisticsMapper.xml @@ -12,15 +12,16 @@ numberOfAmount from ( select - PK_REFERENCE, - count(PK_REFERENCE) numberOfPeople, + o.PK_REFERENCE, + count(DISTINCT o.PK_MEMBER) numberOfPeople, sum(order_amount) numberOfAmount - from sa_order + from sa_order o + right join cu_member m on m.PK_ID = o.pk_member and m.DEL_FLAG = 0 and m.CATEGORY = 0 where - del_flag = 0 + o.del_flag = 0 and order_status = 1 AND (order_type in (1,2) or (order_Type = 3 and ORDER_TYPE_EXTEND = 1)) - and pay_time between #{param.startDate} and #{param.endDate} + and o.pay_time between #{param.startDate} and #{param.endDate} group by PK_REFERENCE ) r left join cu_member cm on r.PK_REFERENCE = cm.pk_id @@ -37,15 +38,16 @@ numberOfAmount from ( select - PK_REFERENCE, - count(PK_REFERENCE) numberOfPeople, + o.PK_REFERENCE, + count(DISTINCT o.PK_MEMBER) numberOfPeople, sum(order_amount) numberOfAmount - from sa_order + from sa_order o + right join cu_member m on m.PK_ID = o.pk_member and m.DEL_FLAG = 0 and m.CATEGORY = 0 where - del_flag = 0 + o.del_flag = 0 and order_status = 1 AND (order_type in (1,2) or (order_Type = 3 and ORDER_TYPE_EXTEND = 1)) - and pay_time between #{param.startDate} and #{param.endDate} + and o.pay_time between #{param.startDate} and #{param.endDate} group by PK_REFERENCE ) r left join cu_member cm on r.PK_REFERENCE = cm.pk_id diff --git a/bd-business/bd-business-sale/src/main/java/com/hzs/activity/recommend/param/AcDirectPushUpgradeListParam.java b/bd-business/bd-business-sale/src/main/java/com/hzs/activity/recommend/param/AcDirectPushUpgradeListParam.java index 02a88f45..7f3b2bca 100644 --- a/bd-business/bd-business-sale/src/main/java/com/hzs/activity/recommend/param/AcDirectPushUpgradeListParam.java +++ b/bd-business/bd-business-sale/src/main/java/com/hzs/activity/recommend/param/AcDirectPushUpgradeListParam.java @@ -25,20 +25,20 @@ public class AcDirectPushUpgradeListParam { /** * 开始活动开始时间 */ - private Date startActStartDate; + private String startActStartDate; /** * 开始活动结束时间 */ - private Date startActEndDate; + private String startActEndDate; /** * 结束活动开始时间 */ - private Date endActStartDate; + private String endActStartDate; /** * 结束活动结束时间 */ - private Date endActEndDate; + private String endActEndDate; } diff --git a/bd-business/bd-business-sale/src/main/java/com/hzs/activity/recommend/vo/AcDirectPushUpgradeListVO.java b/bd-business/bd-business-sale/src/main/java/com/hzs/activity/recommend/vo/AcDirectPushUpgradeListVO.java index 92460b49..630854d8 100644 --- a/bd-business/bd-business-sale/src/main/java/com/hzs/activity/recommend/vo/AcDirectPushUpgradeListVO.java +++ b/bd-business/bd-business-sale/src/main/java/com/hzs/activity/recommend/vo/AcDirectPushUpgradeListVO.java @@ -62,7 +62,7 @@ public class AcDirectPushUpgradeListVO { /** * 升级年月 */ - @Excel(name = "创建时间", dateFormat = "yyyy-MM-dd") + @Excel(name = "升级年月", dateFormat = "yyyy-MM-dd") private String upgradeTime; } diff --git a/bd-business/bd-business-sale/src/main/resources/mapper/activity/recommend/AcRecomUpgradeRecordMapper.xml b/bd-business/bd-business-sale/src/main/resources/mapper/activity/recommend/AcRecomUpgradeRecordMapper.xml index e0b32629..eee2c46a 100644 --- a/bd-business/bd-business-sale/src/main/resources/mapper/activity/recommend/AcRecomUpgradeRecordMapper.xml +++ b/bd-business/bd-business-sale/src/main/resources/mapper/activity/recommend/AcRecomUpgradeRecordMapper.xml @@ -79,23 +79,23 @@ LEFT JOIN BD_GRADE BG ON arur.PK_SETTLE_GRADE = BG.PK_ID LEFT JOIN BD_GRADE BGG ON arur.PK_RECOMMEND_GRADE = BGG.PK_ID WHERE arur.DEL_FLAG = 0 - + AND abc.ACT_NAME = #{actName} - + AND cm.member_code = #{memberCode} - - AND abc.ACT_START_DATE >= #{startActStartDate,javaType=DATE} + + AND abc.ACT_START_DATE >= TO_DATE(SUBSTR(#{startActStartDate},1,10), 'YYYY-MM-DD') - - AND abc.ACT_START_DATE <= #{startActEndDate,javaType=DATE} + + AND abc.ACT_START_DATE <= TO_DATE(SUBSTR(#{startActEndDate},1,10), 'YYYY-MM-DD') - - AND abc.ACT_END_DATE >= #{endActStartDate,javaType=DATE} + + AND abc.ACT_END_DATE >= TO_DATE(SUBSTR(#{endActStartDate},1,10), 'YYYY-MM-DD') - - AND abc.ACT_END_DATE <= #{endActEndDate,javaType=DATE} + + AND abc.ACT_END_DATE <= TO_DATE(SUBSTR(#{endActEndDate},1,10), 'YYYY-MM-DD') diff --git a/bd-common/bd-common-core/src/main/java/com/hzs/common/core/utils/DataMaskingUtil.java b/bd-common/bd-common-core/src/main/java/com/hzs/common/core/utils/DataMaskingUtil.java index 33dfb682..e50a409a 100644 --- a/bd-common/bd-common-core/src/main/java/com/hzs/common/core/utils/DataMaskingUtil.java +++ b/bd-common/bd-common-core/src/main/java/com/hzs/common/core/utils/DataMaskingUtil.java @@ -51,6 +51,13 @@ public class DataMaskingUtil { return result.toString(); } + public static String mask(String input, int keepPrefix, int keepSuffix, int maxLength) { + String str = mask(input, keepPrefix, keepSuffix); + if(str.length() > maxLength) { + str = str.substring(0, maxLength); + } + return str; + } /** * 对字符串进行脱敏处理，可自定义脱敏字符 diff --git a/bd-third/src/main/java/com/hzs/third/pay/jdpay/dto/JdPayAggregateCreateOrderRequest.java b/bd-third/src/main/java/com/hzs/third/pay/jdpay/dto/JdPayAggregateCreateOrderRequest.java index e08f5dfb..0b57bd98 100644 --- a/bd-third/src/main/java/com/hzs/third/pay/jdpay/dto/JdPayAggregateCreateOrderRequest.java +++ b/bd-third/src/main/java/com/hzs/third/pay/jdpay/dto/JdPayAggregateCreateOrderRequest.java @@ -69,10 +69,12 @@ public class JdPayAggregateCreateOrderRequest implements Serializable { * 同步通知页面url */ private String pageBackUrl; + private String pagebackUrl; /** * 点击完成按钮后跳转页面 */ + private String callbackUrl; private String callBackUrl; /** * 风控信息map-- json串 diff --git a/bd-third/src/main/java/com/hzs/third/pay/service/impl/JdPayServiceImpl.java b/bd-third/src/main/java/com/hzs/third/pay/service/impl/JdPayServiceImpl.java index d813651a..fac7d562 100644 --- a/bd-third/src/main/java/com/hzs/third/pay/service/impl/JdPayServiceImpl.java +++ b/bd-third/src/main/java/com/hzs/third/pay/service/impl/JdPayServiceImpl.java @@ -242,8 +242,14 @@ public class JdPayServiceImpl implements IJdPayService { // 用户标识（收银台必传） .userId(userId) // 同步通知URL（收银台必传，页面回调地址） + + .pagebackUrl(jdPayBankProperties.getPageBackUrl() + "?extParam=" + onlinePayment.getExtParam()) .pageBackUrl(jdPayBankProperties.getPageBackUrl() + "?extParam=" + onlinePayment.getExtParam()) + + .callbackUrl(jdPayBankProperties.getPageBackUrl() + "?extParam=" + onlinePayment.getExtParam()) .callBackUrl(jdPayBankProperties.getPageBackUrl() + "?extParam=" + onlinePayment.getExtParam()) + + // 支付回调地址.callBackUrl(jdPayBankProperties.getPageBackUrl() + "?extParam=" + onlinePayment.getExtParam()) // 支付回调地址 .notifyUrl(jdPayBankProperties.getNotifyUrl()) // 交易类型