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:
cabbage 2025-09-26 17:54:37 +08:00
parent bc0f51446f e1da81afaa
commit 1595f11723
10 changed files with 44 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/bonus/service/impl/BonusSettleServiceImpl.java
View File

@ -180,7 +180,9 @@ public class BonusSettleServiceImpl implements IBonusSettleService {
public void calculateCuMemberRetailRangeBySaOrder(SaOrderExt orderExt) {
Integer updateType = null;
String symbol = orderExt.getCancelBool() ? "-" : "+";
if (orderExt.getOrderType().equals(EOrderType.RETAIL_REGISTER.getValue())) {
if (orderExt.getOrderType().equals(EOrderType.RETAIL_REGISTER.getValue())
|| orderExt.getOrderType().equals(EOrderType.RETAIL_UPGRADE.getValue())
) {
updateType = 1;
} else if (orderExt.getOrderType().equals(EOrderType.RETAIL_REPURCHASE.getValue())) {
updateType = 2;

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

@ -467,12 +467,11 @@ public class ApiMemberController extends BaseController {
}
List<memberPointVO> list = iCuMemberRetailService.getMemberPointByUserId(settleTableName,userId);
if (CollectionUtil.isEmpty(list)) {
return null;
return AjaxResult.success();
}
list.forEach(item -> {
item.setMemberSettlePeriod(csPeriod.getSettleDate());
});
memberPointVO memberPointVO = list.get(0);
memberPointVO.setMemberSettlePeriod(csPeriod.getSettleDate());
startPage();
return AjaxResult.success(getDataTable(list));
return AjaxResult.success(memberPointVO);
}
}

17
bd-business/bd-business-member/src/main/java/com/hzs/member/base/controller/manage/CuMemberController.java
View File

@ -22,7 +22,6 @@ import com.hzs.common.core.web.domain.AjaxResult;
import com.hzs.common.core.web.page.TableDataInfo;
import com.hzs.common.domain.member.achieve.CuMemberSettlePeriod;
import com.hzs.common.domain.member.base.CuMember;
import com.hzs.common.domain.member.base.CuMemberRetail;
import com.hzs.common.domain.member.ext.CuMemberExt;
import com.hzs.common.domain.system.config.BdAwards;
import com.hzs.common.security.service.MemberTokenService;
@ -797,10 +796,10 @@ public class CuMemberController extends BaseController {
*/
@Log(module = EOperationModule.MEMBER_POINT, business = EOperationBusiness.MEMBER_POINT, method = EOperationMethod.SELECT)
@GetMapping("/member-point")
public AjaxResult memberPoint(String memberCode,Long memberSettlePeriodId) {
public AjaxResult memberPoint(String memberCode,Long memberSettlePeriodId,String sort,String sortColumn) {
if (memberSettlePeriodId == null) {
log.error("参数错误{}", memberSettlePeriodId);
return AjaxResult.error(MemberMsgConstants.REQUIRED_NOT_EMPTY);
return AjaxResult.error();
}
CuMemberSettlePeriod csPeriod = iCuMemberSettlePeriodService.getById(memberSettlePeriodId);
log.info("会员结算表信息{}",csPeriod);
@ -810,9 +809,9 @@ public class CuMemberController extends BaseController {
Integer isFind = iCuMemberRetailService.getFindCuMemberRetailDetail(settleTableName);
if (isFind == null || isFind != 1) {
log.error("当前表名不存在{}",settleTableName);
return AjaxResult.error("当前会员结算表不存在",settleTableName);
return AjaxResult.error();
}
List<memberPointVO> list = iCuMemberRetailService.getMemberPointByMemberCode(settleTableName,memberCode);
List<memberPointVO> list = iCuMemberRetailService.getMemberPointByMemberCode(settleTableName,memberCode,sort,sortColumn);
list.forEach(item -> {
item.setMemberSettlePeriod(csPeriod.getSettleDate());
});
@ -822,18 +821,16 @@ public class CuMemberController extends BaseController {
/**
*
* @param memberCode
* @param memberSettlePeriodId
* @return
*/
@Log(module = EOperationModule.MEMBER_POINT, business = EOperationBusiness.MEMBER_POINT, method = EOperationMethod.SELECT)
@PostMapping("/member-point-export")
public void memberPointExport(@RequestParam String memberCode,@RequestParam Long memberSettlePeriodId, HttpServletResponse response) {
CuMemberSettlePeriod csPeriod = iCuMemberSettlePeriodService.getById(memberSettlePeriodId);
public void memberPointExport(MemberPointExportParam param, HttpServletResponse response) {
CuMemberSettlePeriod csPeriod = iCuMemberSettlePeriodService.getById(param.getMemberSettlePeriodId());
log.info("会员结算表信息{}",csPeriod);
String settleTableName = TableNameConstants.CU_MEMBER_RETAIL_RANGE + csPeriod.getPkId();
log.info("会员结算表名称{}",settleTableName);
List<memberPointVO> list = iCuMemberRetailService.getMemberPointByMemberCode(settleTableName,memberCode);
List<memberPointVO> list = iCuMemberRetailService.getMemberPointByMemberCode(settleTableName,param.getMemberCode(),param.getSort(),param.getSortColumn());
list.forEach(item -> {
item.setMemberSettlePeriod(csPeriod.getSettleDate());
});

2
bd-business/bd-business-member/src/main/java/com/hzs/member/base/mapper/CuMemberRetailMapper.java
View File

@ -20,7 +20,7 @@ public interface CuMemberRetailMapper extends BaseMapper<CuMemberRetail> {
Integer getFindCumemberRetailDetail(@Param("settleTableName") String settleTableName);
List<memberPointVO> getMemberPointByMemberCode(@Param("settleTableName") String settleTableName, @Param("memberCode") String memberCode);
List<memberPointVO> getMemberPointByMemberCode(@Param("settleTableName") String settleTableName, @Param("memberCode") String memberCode,@Param("sort") String sort,@Param("sortColumn") String sortColumn);
List<memberPointVO> getMemberPointByUserId(@Param("settleTableName") String settleTableName, @Param("userId") Long userId);
}

17
bd-business/bd-business-member/src/main/java/com/hzs/member/base/param/MemberPointExportParam.java Normal file
View File

@ -0,0 +1,17 @@
package com.hzs.member.base.param;
import lombok.AllArgsConstructor;
import lombok.Data;
import lombok.NoArgsConstructor;
import org.springframework.web.bind.annotation.RequestParam;
@Data
@AllArgsConstructor
@NoArgsConstructor
public class MemberPointExportParam {
private String memberCode;
private Long memberSettlePeriodId;
private String sort;
private String sortColumn;
}

2
bd-business/bd-business-member/src/main/java/com/hzs/member/base/service/ICuMemberRetailService.java
View File

@ -17,7 +17,7 @@ public interface ICuMemberRetailService{
Integer getFindCuMemberRetailDetail(String settleTableName);
List<memberPointVO> getMemberPointByMemberCode(String settleTableName, String memberCode);
List<memberPointVO> getMemberPointByMemberCode(String settleTableName, String memberCode,String sort,String sortColumn);
List<memberPointVO> getMemberPointByUserId(String settleTableName, Long userId);
}

5
bd-business/bd-business-member/src/main/java/com/hzs/member/base/service/impl/CuMemberRetailServiceImpl.java
View File

@ -7,7 +7,6 @@ import com.hzs.member.base.service.ICuMemberRetailService;
import com.hzs.member.base.vo.memberPointVO;
import org.springframework.stereotype.Service;
import java.util.Collections;
import java.util.List;
/**
@ -27,8 +26,8 @@ public class CuMemberRetailServiceImpl extends ServiceImpl<CuMemberRetailMapper,
}
@Override
public List<memberPointVO> getMemberPointByMemberCode(String settleTableName, String memberCode) {
return baseMapper.getMemberPointByMemberCode(settleTableName,memberCode);
public List<memberPointVO> getMemberPointByMemberCode(String settleTableName, String memberCode, String sort, String sortColumn) {
return baseMapper.getMemberPointByMemberCode(settleTableName,memberCode,sort,sortColumn);
}
@Override

5
bd-business/bd-business-member/src/main/java/com/hzs/member/structure/controller/api/ApiMemberStructureController.java
View File

@ -7,6 +7,7 @@ import com.hzs.common.core.constant.msg.CommonMsgConstants;
import com.hzs.common.core.enums.*;
import com.hzs.common.core.web.controller.BaseController;
import com.hzs.common.core.web.domain.AjaxResult;
import com.hzs.common.core.web.page.TableDataInfo;
import com.hzs.common.domain.member.achieve.CuMemberRetailDetail;
import com.hzs.common.domain.member.achieve.CuMemberSettlePeriod;
import com.hzs.common.domain.member.base.CuMember;
@ -120,7 +121,7 @@ public class ApiMemberStructureController extends BaseController {
@Log(module = EOperationModule.MEMBER_RETAIL_TREE_LIST, business = EOperationBusiness.MEMBER_RETAIL_TREE_LIST, method = EOperationMethod.SELECT)
@GetMapping("/three-framework-list")
public AjaxResult threeFrameworkList(Integer stage,Integer stageStatus) {
public AjaxResult threeFrameworkList(Integer stage, Integer stageStatus) {
if (stage == null) {
log.error("参数错误");
return AjaxResult.error(CommonMsgConstants.MISSING_PARAM);
@ -141,7 +142,7 @@ public class ApiMemberStructureController extends BaseController {
Integer isFind = iCumemberRetailDetailService.getFindCumemberRetailDetail(settleTableName);
if (isFind == null || isFind != 1) {
log.error("当前会员日结信息不存在{}",settleTableName);
return AjaxResult.error("数据查询错误,请联系客服处理");
return AjaxResult.error();
}
startPage();
// 查询当前会员所有子点位信息

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

@ -22,6 +22,7 @@ import com.hzs.common.core.utils.StringUtils;
import com.hzs.common.core.utils.sign.Base64Util;
import com.hzs.common.core.web.controller.BaseController;
import com.hzs.common.core.web.domain.AjaxResult;
import com.hzs.common.core.web.page.TableDataInfo;
import com.hzs.common.domain.member.achieve.CuMemberRetailDetail;
import com.hzs.common.domain.member.achieve.CuMemberSettlePeriod;
import com.hzs.common.domain.member.achieve.ext.CuMemberRetailSExt;
@ -254,7 +255,7 @@ public class MemberStructureController extends BaseController {
*/
@Log(module = EOperationModule.MEMBER_RETAIL_TREE_LIST, business = EOperationBusiness.MEMBER_RETAIL_TREE_LIST, method = EOperationMethod.SELECT)
@GetMapping("/three-framework-list")
public AjaxResult threeFrameworkList(Long memberSettlePeriodId, String memberCode,Integer stage,Integer stageStatus) {
public AjaxResult threeFrameworkList(Long memberSettlePeriodId, String memberCode, Integer stage, Integer stageStatus) {
if (memberSettlePeriodId == null || memberCode == null || stage == null) {
log.error("参数错误");
return AjaxResult.error(CommonMsgConstants.MISSING_PARAM);
@ -267,7 +268,7 @@ public class MemberStructureController extends BaseController {
Integer isFind = iCumemberRetailDetailService.getFindCumemberRetailDetail(settleTableName);
if (isFind == null || isFind != 1) {
log.error("当前表名不存在{}",settleTableName);
return AjaxResult.error("当前日结信息表不存在",settleTableName);
return AjaxResult.error();
}
startPage();
// 查询当前会员所有子点位信息

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

@ -83,8 +83,9 @@
<if test="memberCode != null and memberCode != ''">
AND cmr.MEMBER_CODE = #{memberCode}
</if>
ORDER BY
cu.CREATION_TIME
<if test="sort != null and sort != '' and sortColumn != null and sortColumn != ''">
ORDER BY cmr.${sortColumn} ${sort}
</if>
</select>
<select id="getMemberPointByUserId" resultType="com.hzs.member.base.vo.memberPointVO">
SELECT