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-22 16:53:22 +08:00
parent b57f668b50 6860d3359b
commit 330d7acfbb
3 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
bd-business/bd-business-bonus/src/main/resources/mapper/bonus/achieve/CuMemberTreeMapper.xml
View File

@ -343,7 +343,7 @@
create unique index PK_${tableName} create unique index PK_${tableName}
on ${tableName} on ${tableName}
( (
PK_MEMBER, CHILD_NODE PK_MEMBER, CHILD_NODE, STAGE
) )
</update> </update>

4
bd-business/bd-business-member/src/main/java/com/hzs/member/structure/controller/manage/MemberStructureController.java
View File

@ -219,7 +219,7 @@ public class MemberStructureController extends BaseController {
@Log(module = EOperationModule.MEMBER_RETAIL_TREE, business = EOperationBusiness.MEMBER_RETAIL_TREE, method = EOperationMethod.SELECT) @Log(module = EOperationModule.MEMBER_RETAIL_TREE, business = EOperationBusiness.MEMBER_RETAIL_TREE, method = EOperationMethod.SELECT)
@GetMapping("/three-framework") @GetMapping("/three-framework")
public AjaxResult Framework(Long memberSettlePeriodId, String memberCode,Integer stage,String childNode,Integer stageStatus) { public AjaxResult Framework(Long memberSettlePeriodId, String memberCode,Integer stage,String childNode,Integer stageStatus) {
if (memberSettlePeriodId == null || memberCode == null || stage == null || stageStatus == null || childNode == null) { if (memberSettlePeriodId == null || memberCode == null || stage == null || childNode == null) {
log.error("参数错误"); log.error("参数错误");
return AjaxResult.error(CommonMsgConstants.MISSING_PARAM); return AjaxResult.error(CommonMsgConstants.MISSING_PARAM);
} }
@ -251,7 +251,7 @@ public class MemberStructureController extends BaseController {
@Log(module = EOperationModule.MEMBER_RETAIL_CHILDNODE, business = EOperationBusiness.MEMBER_RETAIL_CHILDNODE, method = EOperationMethod.SELECT) @Log(module = EOperationModule.MEMBER_RETAIL_CHILDNODE, business = EOperationBusiness.MEMBER_RETAIL_CHILDNODE, method = EOperationMethod.SELECT)
@GetMapping("/childList") @GetMapping("/childList")
public AjaxResult Framework(Long memberSettlePeriodId, String memberCode,Integer stage,Integer stageStatus) { public AjaxResult Framework(Long memberSettlePeriodId, String memberCode,Integer stage,Integer stageStatus) {
if (memberSettlePeriodId == null || memberCode == null || stage == null || stageStatus == null) { if (memberSettlePeriodId == null || memberCode == null || stage == null) {
log.error("参数错误"); log.error("参数错误");
return AjaxResult.error(CommonMsgConstants.MISSING_PARAM); return AjaxResult.error(CommonMsgConstants.MISSING_PARAM);
} }

8
bd-business/bd-business-member/src/main/resources/mapper/retail/member/CuMemberRetailDetailMapper.xml
View File

@ -11,7 +11,9 @@
WHERE WHERE
cu.MEMBER_CODE = #{ memberCode } cu.MEMBER_CODE = #{ memberCode }
AND cud.STAGE = #{ stage } AND cud.STAGE = #{ stage }
AND cud.STAGE_STATUS = #{ stageStatus } <if test="stageStatus != null">
and cud.STAGE_STATUS = #{stageStatus}
</if>
</select> </select>
<select id="getFindCumemberRetailDetail" resultType="java.lang.Integer"> <select id="getFindCumemberRetailDetail" resultType="java.lang.Integer">
@ -29,7 +31,9 @@
WHERE WHERE
cu.MEMBER_CODE = #{ memberCode } cu.MEMBER_CODE = #{ memberCode }
AND STAGE = #{stage} AND STAGE = #{stage}
AND STAGE_STATUS = #{stageStatus} <if test="stageStatus != null">
and cud.STAGE_STATUS = #{stageStatus}
</if>
AND CHILD_NODE = #{childNode} AND CHILD_NODE = #{childNode}
</select> </select>
</mapper> </mapper>