angelo
/
java-base-app
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

This commit is contained in:
cabbage 2025-09-24 13:37:56 +08:00
parent 9a11740058 77fa0d3ddf
commit c9ebb280d3
8 changed files with 41 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
bd-business/bd-business-member/src/main/java/com/hzs/member/statis/controller/manager/BackMemberStatisticsController.java
View File

@ -38,6 +38,18 @@ public class BackMemberStatisticsController {
redisService.setCacheObject(CacheConstants.TOP_30_ACTIVITY + ETop30Type.AMOUNT.getKey(), flag);
return AjaxResult.success();
}
@GetMapping("/getShowPeople")
public AjaxResult getShowPeople() {
return AjaxResult.success("操作成功!", redisService.getCacheObject(CacheConstants.TOP_30_ACTIVITY + ETop30Type.PEOPLE.getKey()));
}
@GetMapping("/getShowAmount")
public AjaxResult getShowAmount() {
return AjaxResult.success("操作成功!", redisService.getCacheObject(CacheConstants.TOP_30_ACTIVITY + ETop30Type.AMOUNT.getKey()));
}
@PostMapping("/topPeople")
public AjaxResult topPeople(@RequestBody DirectStatisticsTop30QueryParam param) {
param.setFaker(false);

6
bd-business/bd-business-member/src/main/java/com/hzs/member/statis/service/impl/MemberStatisticsServiceImpl.java
View File

@ -72,8 +72,10 @@ public class MemberStatisticsServiceImpl implements IMemberStatisticsService {
result = generateFakeData(list, 30, fakerList, type);
}
for (DirectStatisticsTop30VO directStatisticsTop30VO : result) {
directStatisticsTop30VO.setMemberCode(DataMaskingUtil.mask(directStatisticsTop30VO.getMemberCode(), 2, 2));
directStatisticsTop30VO.setMemberName(DataMaskingUtil.mask(directStatisticsTop30VO.getMemberName(), 1, 0));
if(param.getFaker()){
directStatisticsTop30VO.setMemberCode(DataMaskingUtil.mask(directStatisticsTop30VO.getMemberCode(), 2, 2));
directStatisticsTop30VO.setMemberName(DataMaskingUtil.mask(directStatisticsTop30VO.getMemberName(), 1, 0));
}
directStatisticsTop30VO.setNumberOfAmount(directStatisticsTop30VO.getNumberOfAmount().divide(new BigDecimal(10000)));
}
return result;

2
bd-business/bd-business-member/src/main/resources/mapper/member/statis/MemberStatisticsMapper.xml
View File

@ -19,6 +19,7 @@
where
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}
group by PK_REFERENCE
) r
@ -43,6 +44,7 @@
where
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}
group by PK_REFERENCE
) r

5
bd-business/bd-business-sale/src/main/java/com/hzs/activity/recommend/controller/AcRecommendConfigController.java
View File

@ -70,7 +70,7 @@ public class AcRecommendConfigController extends BaseController {
* @param acDirectPushUpgradeParam
* @return
*/
@Log(module = EOperationModule.AC_DIRECT_PUSH_UPGRADE, business = EOperationBusiness.AC_DIRECT_PUSH_UPGRADE, method = EOperationMethod.INSERT, remark = "在线签呈")
@Log(module = EOperationModule.AC_DIRECT_PUSH_UPGRADE, business = EOperationBusiness.AC_DIRECT_PUSH_UPGRADE, method = EOperationMethod.INSERT)
@PostMapping("/directPushUpgrade")
public AjaxResult directPushUpgradeSubmit(@RequestBody AcDirectPushUpgradeParam acDirectPushUpgradeParam) {
acDirectPushUpgradeParam.setPkCountry(SecurityUtils.getPkCountry());
@ -87,13 +87,14 @@ public class AcRecommendConfigController extends BaseController {
* @param param
* @return
*/
@Log(module = EOperationModule.AC_DIRECT_PUSH_UPGRADE, business = EOperationBusiness.AC_DIRECT_PUSH_UPGRADE, method = EOperationMethod.SELECT, remark = "在线签呈")
@Log(module = EOperationModule.AC_DIRECT_PUSH_UPGRADE_LIST, business = EOperationBusiness.AC_DIRECT_PUSH_UPGRADE_LIST, method = EOperationMethod.SELECT)
@GetMapping("/directPushUpgradeList")
public TableDataInfo directPushUpgradeList(AcDirectPushUpgradeListParam param) {
startPage();
return getDataTable(iAcRecomUpgradeRecordService.queryList(param));
}
@Log(module = EOperationModule.AC_DIRECT_PUSH_UPGRADE_LIST, business = EOperationBusiness.AC_DIRECT_PUSH_UPGRADE_LIST, method = EOperationMethod.SELECT)
@PostMapping("/directPushUpgradeExport")
public void export(AcDirectPushUpgradeListParam param, HttpServletResponse response) {
startPage();

12
bd-business/bd-business-sale/src/main/java/com/hzs/activity/recommend/vo/AcDirectPushUpgradeListVO.java
View File

@ -41,22 +41,22 @@ public class AcDirectPushUpgradeListVO {
/**
* 活动开始时间
*/
@Excel(name = "活动开始时间", dateFormat = "yyyy-MM-dd HH:mm:ss")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@Excel(name = "活动开始时间", dateFormat = "yyyy-MM-dd")
@JsonFormat(pattern = "yyyy-MM-dd")
private Date actStartDate;
/**
* 活动结束时间
*/
@Excel(name = "活动结束时间", dateFormat = "yyyy-MM-dd HH:mm:ss")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@Excel(name = "活动结束时间", dateFormat = "yyyy-MM-dd")
@JsonFormat(pattern = "yyyy-MM-dd")
private Date actEndDate;
/**
* 创建时间
*/
@Excel(name = "创建时间", dateFormat = "yyyy-MM-dd HH:mm:ss")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@Excel(name = "创建时间", dateFormat = "yyyy-MM-dd")
@JsonFormat(pattern = "yyyy-MM-dd")
private Date creationTime;
/**

21
bd-business/bd-business-sale/src/main/resources/mapper/activity/recommend/AcRecomUpgradeRecordMapper.xml
View File

@ -64,8 +64,8 @@
<select id="queryList" resultType="com.hzs.activity.recommend.dto.AcDirectPushUpgradeListDTO">
SELECT
abc.ACT_NAME,
cmm.member_code,
cmm.member_name,
cm.member_code,
cm.member_name,
arur.PK_SETTLE_GRADE,
arur.PK_RECOMMEND_GRADE,
abc.ACT_START_DATE,
@ -75,26 +75,25 @@
FROM
AC_RECOM_UPGRADE_RECORD arur
LEFT JOIN AC_BASE_CONFIG abc ON arur.PK_BASE_ID = abc.PK_ID
LEFT JOIN CU_MEMBER cm ON arur.pk_member = cm.PK_PARENT
LEFT JOIN CU_MEMBER cmm ON cm.PK_PARENT = cmm.PK_ID
LEFT JOIN CU_MEMBER cm ON arur.pk_member = cm.PK_ID
WHERE arur.DEL_FLAG = 0
<if test="actName != null">
AND abc.ACT_NAME = #{actName}
</if>
<if test="memberCode != null">
AND cmm.member_code = #{memberCode}
AND cm.member_code = #{memberCode}
</if>
<if test="startActStartDate != null">
AND abc.ACT_START_DATE >= #{startActStartDate}
AND abc.ACT_START_DATE >= #{startActStartDate,javaType=DATE}
</if>
<if test="startActEndDate != null">
AND abc.ACT_START_DATE &lt;= #{startActEndDate}
</if>
<if test="startActEndDate != null">
AND abc.ACT_END_DATE >= #{endActStartDate}
AND abc.ACT_START_DATE &lt;= #{startActEndDate,javaType=DATE}
</if>
<if test="endActStartDate != null">
AND abc.ACT_END_DATE &lt;= #{endActEndDate}
AND abc.ACT_END_DATE >= #{endActStartDate,javaType=DATE}
</if>
<if test="endActEndDate != null">
AND abc.ACT_END_DATE &lt;= #{endActEndDate,javaType=DATE}
</if>
</select>

2
bd-common/bd-common-core/src/main/java/com/hzs/common/core/enums/EOperationBusiness.java
View File

@ -256,6 +256,8 @@ public enum EOperationBusiness {
AC_DIRECT_PUSH_UPGRADE("直推升级"),
AC_DIRECT_PUSH_UPGRADE_LIST("直推升级数据"),
AC_WARES_RULE_CONFIG("商品赠送"),

2
bd-common/bd-common-core/src/main/java/com/hzs/common/core/enums/EOperationModule.java
View File

@ -355,6 +355,8 @@ public enum EOperationModule {
AC_DIRECT_PUSH_UPGRADE("直推升级"),
AC_DIRECT_PUSH_UPGRADE_LIST("直推升级数据"),
AC_TOURISM_CONFIG("旅游活动"),
AC_WARES_RULE_CONFIG("商品赠送"),