forked from angelo/java-retail-app
## 后台办理业务手动激活推送秒结状态MQ；
This commit is contained in:
parent
b32e00d74e
commit
f5b00b773e
|
|
@ -14,10 +14,7 @@ import com.hzs.bonus.bonus.service.ICuMemberBonusService;
|
|||
import com.hzs.bonus.bonus.vo.MemberBonusDetailSerVO;
|
||||
import com.hzs.bonus.bonus.vo.MemberBonusDetailVO;
|
||||
import com.hzs.bonus.bonus.vo.MemberBonusVO;
|
||||
import com.hzs.common.core.constant.HttpStatus;
|
||||
import com.hzs.common.core.constant.MemberBonusFieldConstants;
|
||||
import com.hzs.common.core.constant.MemberFieldConstants;
|
||||
import com.hzs.common.core.constant.SystemFieldConstants;
|
||||
import com.hzs.common.core.constant.*;
|
||||
import com.hzs.common.core.domain.R;
|
||||
import com.hzs.common.core.enums.*;
|
||||
import com.hzs.common.core.utils.ComputeUtil;
|
||||
|
|
|
|||
|
|
@ -134,8 +134,8 @@ public class CuMemberServiceImpl extends ServiceImpl<CuMemberMapper, CuMember> i
|
|||
save = true;
|
||||
}
|
||||
} catch (Exception e) {
|
||||
e.printStackTrace();
|
||||
throw new RuntimeException(e);
|
||||
log.error("saveMember error: {}", e.getMessage(), e);
|
||||
throw new ServiceException(e.getMessage());
|
||||
}
|
||||
return save;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -62,9 +62,6 @@ import java.util.stream.Collectors;
|
|||
|
||||
/**
|
||||
* 业务办理表 前端控制器
|
||||
*
|
||||
* @author zhangjing
|
||||
* @since 2023-01-11
|
||||
*/
|
||||
@RestController
|
||||
@RequestMapping("/manage/handle-business")
|
||||
|
|
@ -102,11 +99,7 @@ public class CuHandleBusinessController extends BaseController {
|
|||
|
||||
|
||||
/**
|
||||
* @description: 查询办理业务列表
|
||||
* @author: zhang jing
|
||||
* @date: 2023/1/12 14:58
|
||||
* @param: [handleBusinessVO]
|
||||
* @return: com.hzs.common.core.web.page.TableDataInfo
|
||||
* 查询办理业务列表
|
||||
**/
|
||||
@AccessPermissions("BasicBusiness")
|
||||
@Log(module = EOperationModule.HANDLE_BUSINESS, business = EOperationBusiness.BASE_BUSINESS, method = EOperationMethod.SELECT)
|
||||
|
|
@ -154,11 +147,7 @@ public class CuHandleBusinessController extends BaseController {
|
|||
}
|
||||
|
||||
/**
|
||||
* @description: 校验同姓名同手机号是否满足规则
|
||||
* @author: zhang jing
|
||||
* @date: 2024/12/19 14:27
|
||||
* @param: [handleBusinessList]
|
||||
* @return: java.lang.String
|
||||
* 校验同姓名同手机号是否满足规则
|
||||
**/
|
||||
public List<BusinessErrorVO> checkNamePhone(List<BusinessMemberVO> businessMemberList) {
|
||||
//如果只有修改姓名业务或者修改手机业务
|
||||
|
|
@ -238,27 +227,8 @@ public class CuHandleBusinessController extends BaseController {
|
|||
return errorList;
|
||||
}
|
||||
|
||||
|
||||
/**
|
||||
* @param CuHandleBusinessVO
|
||||
* @return
|
||||
*/
|
||||
@Log(module = EOperationModule.HANDLE_BUSINESS, method = EOperationMethod.SELECT)
|
||||
@PostMapping("/confirm")
|
||||
public AjaxResult confirmHandleBusiness(@RequestBody HandleBusinessVO CuHandleBusinessVO) {
|
||||
Integer pkCountry = SecurityUtils.getPkCountry();
|
||||
|
||||
|
||||
return null;
|
||||
}
|
||||
|
||||
|
||||
/**
|
||||
* @description: 业务办理导入数据
|
||||
* @author: zhang jing
|
||||
* @date: 2023/1/21 9:26
|
||||
* @param: [file, updateSupport]
|
||||
* @return: com.hzs.common.core.web.domain.AjaxResult
|
||||
* 业务办理导入数据
|
||||
**/
|
||||
@PostMapping("/importData")
|
||||
@Log(module = EOperationModule.HANDLE_BUSINESS, business = EOperationBusiness.BASE_BUSINESS, method = EOperationMethod.IMPORT)
|
||||
|
|
@ -303,11 +273,7 @@ public class CuHandleBusinessController extends BaseController {
|
|||
}
|
||||
|
||||
/**
|
||||
* @description: 办理业务-基础业务校验
|
||||
* @author: zhang jing
|
||||
* @date: 2023/1/21 10:31
|
||||
* @param: [businessSingleVO]
|
||||
* @return: com.hzs.common.core.web.domain.AjaxResult
|
||||
* 办理业务-基础业务校验
|
||||
**/
|
||||
@Log(module = EOperationModule.HANDLE_BUSINESS, business = EOperationBusiness.BASE_BUSINESS, method = EOperationMethod.SELECT)
|
||||
@PostMapping("/businessCheck")
|
||||
|
|
@ -432,7 +398,7 @@ public class CuHandleBusinessController extends BaseController {
|
|||
nuc.setMemberCode(cov.getMemberCode());
|
||||
nuc.setMemberName(cov.getMemberName());
|
||||
nuc.setPhone(cov.getPhone());
|
||||
if(StringUtils.isNotNull(uc.getEndValidityDate())){
|
||||
if (StringUtils.isNotNull(uc.getEndValidityDate())) {
|
||||
LocalDateTime localDateTime = uc.getEndValidityDate().toInstant()
|
||||
.atZone(ZoneId.systemDefault())
|
||||
.toLocalDateTime();
|
||||
|
|
@ -938,11 +904,7 @@ public class CuHandleBusinessController extends BaseController {
|
|||
|
||||
|
||||
/**
|
||||
* @description: 校验用户余额是否充足
|
||||
* @author: zhang jing
|
||||
* @date: 2023/6/7 11:33
|
||||
* @param: [businessSingleVO]
|
||||
* @return: com.hzs.common.core.web.domain.AjaxResult
|
||||
* 校验用户余额是否充足
|
||||
**/
|
||||
@Log(module = EOperationModule.HANDLE_BUSINESS, business = EOperationBusiness.BASE_BUSINESS, method = EOperationMethod.SELECT)
|
||||
@PostMapping("/balanceCheck")
|
||||
|
|
@ -974,11 +936,7 @@ public class CuHandleBusinessController extends BaseController {
|
|||
}
|
||||
|
||||
/**
|
||||
* @description: 更新新值
|
||||
* @author: zhang jing
|
||||
* @date: 2023/3/20 12:11
|
||||
* @param: []
|
||||
* @return: java.lang.String
|
||||
* 更新新值
|
||||
**/
|
||||
private String newValue(List<Integer> businessValueList) {
|
||||
//更新会员新值
|
||||
|
|
@ -999,11 +957,7 @@ public class CuHandleBusinessController extends BaseController {
|
|||
|
||||
|
||||
/**
|
||||
* @description: 重新申请办理业务
|
||||
* @author: zhang jing
|
||||
* @date: 2023/2/1 21:47
|
||||
* @param: [businessMemberVO]
|
||||
* @return: com.hzs.common.core.web.domain.AjaxResult
|
||||
* 重新申请办理业务
|
||||
**/
|
||||
@Log(module = EOperationModule.HANDLE_BUSINESS, business = EOperationBusiness.BASE_BUSINESS, method = EOperationMethod.SUBMIT)
|
||||
@PostMapping("/againBusiness")
|
||||
|
|
@ -1025,13 +979,12 @@ public class CuHandleBusinessController extends BaseController {
|
|||
}
|
||||
|
||||
/**
|
||||
* yh
|
||||
* 在线签呈(发起人)
|
||||
*
|
||||
* @return
|
||||
*/
|
||||
@Log(module = EOperationModule.HANDLE_BUSINESS, business = EOperationBusiness.BASE_BUSINESS, method = EOperationMethod.SUBMIT)
|
||||
@PostMapping("online-petition")
|
||||
@PostMapping("/online-petition")
|
||||
public AjaxResult signOnline(@RequestBody OnlinePetitionVo linePetitionVo) {
|
||||
SysUser loginUser = userTokenService.getLoginUser().getLoginSysUser();
|
||||
|
||||
|
|
|
|||
|
|
@ -20,7 +20,6 @@ public interface ICuHandleBusinessService extends IService<CuHandleBusiness> {
|
|||
**/
|
||||
List<HandleBusinessShowVO> queryHandleBusinessList(HandleBusinessShowVO handleBusinessVO);
|
||||
|
||||
|
||||
/**
|
||||
* 保存业务办理信息
|
||||
*
|
||||
|
|
|
|||
|
|
@ -127,6 +127,7 @@ public class CuHandleBusinessServiceImpl extends ServiceImpl<CuHandleBusinessMap
|
|||
//流程类型（1 免签呈 2免付费 3免签呈+免付费 4 需要签呈需要付费）
|
||||
//更新业务办理
|
||||
if (processType.equals(EProcessType.AVOIDSIGNING.getValue()) || processType.equals(EProcessType.DOUBLEAVOID.getValue())) {
|
||||
// 免签或全免
|
||||
result = updateBusinessMember(handleBusinessVO, loginUser);
|
||||
}
|
||||
//扣手续费
|
||||
|
|
@ -522,11 +523,7 @@ public class CuHandleBusinessServiceImpl extends ServiceImpl<CuHandleBusinessMap
|
|||
}
|
||||
|
||||
/**
|
||||
* @description: 校验 handleBusinessesList的getBusinessNo是否存在重复
|
||||
* @author: zhang jing
|
||||
* @date: 2024/7/10 14:37
|
||||
* @param: [list]
|
||||
* @return: boolean
|
||||
* 校验 handleBusinessesList的getBusinessNo是否存在重复
|
||||
**/
|
||||
public static boolean checkRepeat(List<CuHandleBusiness> list) {
|
||||
Map<String, Long> counts = list.stream()
|
||||
|
|
@ -688,6 +685,21 @@ public class CuHandleBusinessServiceImpl extends ServiceImpl<CuHandleBusinessMap
|
|||
saveMemberAwards(handleBusinessVO, loginUser);
|
||||
result = row > 0;
|
||||
}
|
||||
|
||||
if (result) {
|
||||
// 修改是否激活，旧值为未激活，新值为激活的会员需要推MQ处理秒结状态
|
||||
List<Long> pkMemberList = handleBusinessVO.getBusinessMemberList().stream()
|
||||
.filter(
|
||||
tmpData -> EApprovalBusiness.IS_ACTIVATE.getValue() == tmpData.getBusinessType()
|
||||
&& tmpData.getOldValue().equals(EYesNo.NO.getIntValue() + "")
|
||||
&& tmpData.getNewValue().equals(EYesNo.YES.getIntValue() + "")
|
||||
)
|
||||
.map(BusinessMemberVO::getPkMember)
|
||||
.collect(Collectors.toList());
|
||||
// 推送会员激活处理
|
||||
rabbitTemplate.convertAndSend(RabbitMqConstants.ORDER_SECOND_ACTIVATE_COMPENSATION_EXCHANGE, RabbitMqConstants.ORDER_SECOND_ACTIVATE_COMPENSATION_KEY, pkMemberList);
|
||||
}
|
||||
|
||||
return result;
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -6,24 +6,18 @@ import lombok.Data;
|
|||
import lombok.NoArgsConstructor;
|
||||
|
||||
import java.io.Serializable;
|
||||
import java.math.BigDecimal;
|
||||
import java.util.List;
|
||||
|
||||
/**
|
||||
* <p>
|
||||
* 业务办理表Vo办理基础业务实体VO
|
||||
* </p>
|
||||
*
|
||||
* @author zhangjing
|
||||
* @since 2023-01-11
|
||||
*/
|
||||
@Data
|
||||
@AllArgsConstructor
|
||||
@NoArgsConstructor
|
||||
public class HandleBusinessVO implements Serializable{
|
||||
public class HandleBusinessVO implements Serializable {
|
||||
|
||||
|
||||
private long serialVersionUID = -7461122780634685808L;
|
||||
private long serialVersionUID = -7461122780634685808L;
|
||||
|
||||
/**
|
||||
* 会员信息集合
|
||||
|
|
@ -101,6 +95,4 @@ public class HandleBusinessVO implements Serializable{
|
|||
private BusinessTableVO btvo;
|
||||
|
||||
|
||||
|
||||
|
||||
}
|
||||
|
|
|
|||
|
|
@ -5,11 +5,7 @@ import lombok.AllArgsConstructor;
|
|||
import lombok.Getter;
|
||||
|
||||
/**
|
||||
* @Description: 签呈流程类型
|
||||
* @Author: jiang chao
|
||||
* @Time: 2022/11/10 17:35
|
||||
* @Classname: ESignType
|
||||
* @PackageName: com.hzs.common.core.enums
|
||||
* 签呈流程类型
|
||||
*/
|
||||
@AllArgsConstructor
|
||||
@Getter
|
||||
|
|
|
|||
Loading…
Reference in New Issue