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

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

This commit is contained in:
sangelxiu1 2025-09-29 09:40:00 +08:00
parent 6e730f5da1 072ba08f67
commit b1e6f3cc53
2 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
bd-business/bd-business-member/src/main/java/com/hzs/member/base/controller/api/ApiMemberController.java
View File

@ -467,6 +467,9 @@ public class ApiMemberController extends BaseController {
return AjaxResult.error("数据查询错误,请联系客服处理"); return AjaxResult.error("数据查询错误,请联系客服处理");
} }
MemberPointVO memberPointVO = iCuMemberRetailService.getMemberPointByUserId(settleDetailTableName,settleTableName,userId); MemberPointVO memberPointVO = iCuMemberRetailService.getMemberPointByUserId(settleDetailTableName,settleTableName,userId);
if (memberPointVO == null) {
return AjaxResult.error("数据查询错误,请联系客服处理");
}
memberPointVO.setMemberSettlePeriod(csPeriod.getSettleDate()); memberPointVO.setMemberSettlePeriod(csPeriod.getSettleDate());
startPage(); startPage();
return AjaxResult.success(memberPointVO); return AjaxResult.success(memberPointVO);

4
bd-business/bd-business-member/src/main/resources/mapper/member/base/CuMemberRetailMapper.xml
View File

@ -108,9 +108,9 @@
COUNT(CASE WHEN curd.STAGE = 2 AND curd.STAGE_STATUS = 1 THEN 1 END) AS secondOrderQuantity, COUNT(CASE WHEN curd.STAGE = 2 AND curd.STAGE_STATUS = 1 THEN 1 END) AS secondOrderQuantity,
COUNT(CASE WHEN curd.STAGE = 3 AND curd.STAGE_STATUS = 1 THEN 1 END) AS threeOrderQuantity COUNT(CASE WHEN curd.STAGE = 3 AND curd.STAGE_STATUS = 1 THEN 1 END) AS threeOrderQuantity
FROM FROM
#{settleTableName} cmr ${settleTableName} cmr
LEFT JOIN CU_MEMBER cu ON cmr.PK_MEMBER = cu.PK_ID LEFT JOIN CU_MEMBER cu ON cmr.PK_MEMBER = cu.PK_ID
LEFT JOIN #{settleDetailTableName} curd ON cmr.PK_MEMBER = curd.PK_MEMBER LEFT JOIN ${settleDetailTableName} curd ON cmr.PK_MEMBER = curd.PK_MEMBER
WHERE WHERE
cmr.PK_MEMBER = #{userId} cmr.PK_MEMBER = #{userId}
GROUP BY GROUP BY