소스 검색

//delete

private_deployment
xhxu 1 년 전
부모
커밋
8a0152e4ec
4개의 변경된 파일0개의 추가작업 그리고 190개의 파일을 삭제
  1. +0
    -21
      suimangMQConsumer/src/main/java/com/iformall/mq/MqBaseConsumer.java
  2. +0
    -7
      suimangService/src/main/java/com/iformall/service/impl/WxCreditHistoryServiceImpl.java
  3. +0
    -124
      suimangService/src/main/java/com/iformall/service/msg/impl/AfterAddCreditMsgServiceImpl.java
  4. +0
    -38
      suimangService/src/main/java/com/iformall/service/msg/impl/SyncMemberCardMsgServiceImpl.java

+ 0
- 21
suimangMQConsumer/src/main/java/com/iformall/mq/MqBaseConsumer.java 파일 보기

@@ -31,16 +31,10 @@ public class MqBaseConsumer {
@Autowired
private SendWeappUniformMsgServiceImpl sendWeappUniformMsgService;
@Autowired
private AfterAddCreditMsgServiceImpl afterAddCreditMsgService;
@Autowired
private AfterAddScoreMsgServiceImpl afterAddScoreMsgService;
@Autowired
private AfterCarInOutMsgServiceImpl afterCarInOutMsgService;
@Autowired
private AfterBusinessCreditMsgServiceImpl afterBusinessCreditMsgService;
@Autowired
private SyncMemberCardMsgServiceImpl syncMemberCardMsgService;
@Autowired
private FmInsideOrderSuccessMsgServiceImpl fmInsideOrderSuccessMsgService;
@Autowired
private FmInsideCouponVerifyMsgServiceImpl fmInsideCouponVerifyMsgService;
@@ -119,16 +113,6 @@ public class MqBaseConsumer {
AppUniformMsg msg = (AppUniformMsg)JsonUtil.readValue(message,AppUniformMsg.class);
sendWeappUniformMsgService.send(msg);
}
else if(EnumMsgRecordType.SYNC_MEMBER_CARD.getCode().equals(baseMsg.getMsgType())) {
//微信商圈同步会员
SyncMemberCardMsg msg = (SyncMemberCardMsg)JsonUtil.readValue(message,SyncMemberCardMsg.class);
syncMemberCardMsgService.send(msg);
}
else if(EnumMsgRecordType.AFTER_ADD_CREDIT.getCode().equals(baseMsg.getMsgType())) {
//积分变更后
AfterAddCreditMsg msg = (AfterAddCreditMsg)JsonUtil.readValue(message,AfterAddCreditMsg.class);
afterAddCreditMsgService.send(msg);
}
else if(EnumMsgRecordType.AFTER_ADD_SCORE.getCode().equals(baseMsg.getMsgType())) {
//成长值变更后
AfterAddScoreMsg msg = (AfterAddScoreMsg)JsonUtil.readValue(message,AfterAddScoreMsg.class);
@@ -139,11 +123,6 @@ public class MqBaseConsumer {
AfterCarInOutMsg msg = (AfterCarInOutMsg)JsonUtil.readValue(message,AfterCarInOutMsg.class);
afterCarInOutMsgService.send(msg);
}
else if(EnumMsgRecordType.AFTER_BUSINESS_CREDIT.getCode().equals(baseMsg.getMsgType())) {
//商圈积分后
AfterBusinessCreditMsg msg = (AfterBusinessCreditMsg)JsonUtil.readValue(message,AfterBusinessCreditMsg.class);
afterBusinessCreditMsgService.send(msg);
}
else if(EnumMsgRecordType.INSIDE_ORDER_SUCCESS.getCode().equals(baseMsg.getMsgType())) {
// 内部消息 - 下订单成功
FmInsideOrderSuccessMsg msg = (FmInsideOrderSuccessMsg)JsonUtil.readValue(message,FmInsideOrderSuccessMsg.class);


+ 0
- 7
suimangService/src/main/java/com/iformall/service/impl/WxCreditHistoryServiceImpl.java 파일 보기

@@ -99,8 +99,6 @@ public class WxCreditHistoryServiceImpl implements WxCreditHistoryService {
@Autowired
private WxTemplateMsgService wxTemplateMsgService;

@Autowired
private WxMemberCardService wxMemberCardService;

@Override
public void clearCreditByYear() {
@@ -134,9 +132,6 @@ public class WxCreditHistoryServiceImpl implements WxCreditHistoryService {
Date date = DateUtils.stringToDate(beforeYesterday);
creditHistoryQ.setStartTime(date);
List<WxCreditHistory> list = wxCreditHistoryMapper.getIsMemberCarAndClearCredit(creditHistoryQ);
for (WxCreditHistory history:list) {
wxMemberCardService.sendsyncMemberCardBonusMsg(tenantInfo,null,history.getCUserId(),history.getId());
}
}

@Override
@@ -653,8 +648,6 @@ public class WxCreditHistoryServiceImpl implements WxCreditHistoryService {
if(!record.getTenantId().equals(tenantId)){
tenantEntity.setParentTenantId(record.getTenantId());
}
wxMemberCardService.sendsyncMemberCardBonusMsg(tenantEntity,null,wxCUserBasicInfo.getId(),record.getId());


} else {
//wxCreditHistoryMapper.updateById(record);


+ 0
- 124
suimangService/src/main/java/com/iformall/service/msg/impl/AfterAddCreditMsgServiceImpl.java 파일 보기

@@ -1,124 +0,0 @@
package com.iformall.service.msg.impl;

import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.iformall.common.ResultData;
import com.iformall.domain.po.*;
import com.iformall.domain.po.base.TenantEntity;
import com.iformall.domain.po.msg.AfterAddCreditMsg;
import com.iformall.domain.po.msg.AppUniformMsg;
import com.iformall.domain.po.msg.BaseMsg;
import com.iformall.enums.EnumAppPlat;
import com.iformall.enums.EnumBusinessType;
import com.iformall.enums.EnumMemberCardStatus;
import com.iformall.mapper.*;
import com.iformall.service.WxAppinfoService;
import com.iformall.service.WxCUserService;
import com.iformall.service.WxMemberCardService;
import com.iformall.service.WxPayAccountService;
import com.iformall.service.msg.MsgSendService;
import com.iformall.service.wechat.FmOpenService;
import org.apache.commons.lang3.StringUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;

import java.util.ArrayList;
import java.util.List;

/**
*
*/
@Service
public class AfterAddCreditMsgServiceImpl implements MsgSendService {

private final Logger logger = LoggerFactory.getLogger(this.getClass());

@Autowired
private WxAppinfoService wxAppinfoService;

@Autowired
private WxPayAccountService wxPayAccountService;

@Autowired
private WxMemberCardService wxMemberCardService;

@Autowired
private WxCUserBasicInfoMapper wxCUserBasicInfoMapper;

@Autowired
private WxCUserMapper wxCUserMapper;

@Autowired
private WxMemberCardMapper wxMemberCardMapper;

@Autowired
private WxCreditHistoryMapper wxCreditHistoryMapper;


@Override
public void send(BaseMsg baseMsg) throws Exception{
AfterAddCreditMsg afterAddCreditMsg = (AfterAddCreditMsg)baseMsg;

TenantEntity tenantEntity = new TenantEntity();
tenantEntity.setTenantId(afterAddCreditMsg.getTenantId());
tenantEntity.setParentTenantId(afterAddCreditMsg.getParentTenantId());

//微信商圈同步会员积分
WxAppinfo cAppInfo = wxAppinfoService.getCAppInfoFromRedis(tenantEntity.getTenantId(), EnumAppPlat.WX);
if(cAppInfo == null){
logger.error("未找到微信C端小程序");
return;
}
WxPayAccount payAccount = wxPayAccountService.getByIdFromRedis(cAppInfo.getPayId());
if(payAccount == null){
logger.error("未找到微信支付配置");
return;
}
if(!EnumBusinessType.BUSINESS_3.getCode().equals(payAccount.getBusinessType())){
logger.error("未找到商圈配置或商圈版本不支持");
return;
}
if(afterAddCreditMsg.getBasicUserId() != null){
Long cuserId = wxCUserMapper.findCuserId(afterAddCreditMsg.getBasicUserId(), afterAddCreditMsg.getTenantId());
afterAddCreditMsg.setCuserId(cuserId);
}

WxMemberCard memberCardQ = new WxMemberCard();
memberCardQ.updateFinalTenantId(tenantEntity);
memberCardQ.setCuserId(afterAddCreditMsg.getCuserId());
memberCardQ.setUserCardStatus(EnumMemberCardStatus.EFFECTIVE.getCode());
List<WxMemberCard> memberCards = wxMemberCardMapper.findList(memberCardQ);
if(memberCards == null || memberCards.isEmpty()){
logger.error("该用户未授权商圈"+afterAddCreditMsg.getCuserId());
return;
}
String markid = null;
Integer before_bonus_value = 0,bonus_value = 0;

if(afterAddCreditMsg.getCreditHistoryId() == null){
if(afterAddCreditMsg.getBasicUserId() == null){
WxCUser wxCUser = wxCUserMapper.selectById(afterAddCreditMsg.getCuserId(),afterAddCreditMsg.getTenantId());
afterAddCreditMsg.setBasicUserId(wxCUser.getUserId());
}

WxCUserBasicInfo basicInfo = wxCUserBasicInfoMapper.selectById(afterAddCreditMsg.getBasicUserId(), tenantEntity.getFinalTenantId());
markid = basicInfo.getId().toString();
bonus_value = basicInfo.getCredit();
}else{
WxCreditHistory wxCreditHistory = wxCreditHistoryMapper.selectById(afterAddCreditMsg.getCreditHistoryId(), tenantEntity.getFinalTenantId());
markid = wxCreditHistory.getId().toString();
before_bonus_value = wxCreditHistory.getCreditAmount()-wxCreditHistory.getCreditNum();
bonus_value = wxCreditHistory.getCreditAmount();
}

for(int i = 0;i < memberCards.size();i++){
WxMemberCard memberCard = memberCards.get(i);
markid = markid + "_" + i;
ResultData resultData = wxMemberCardService.syncMemberCardBonus(tenantEntity, memberCard.getCardId(), memberCard.getCardCode(), markid,
before_bonus_value, bonus_value, null);
logger.info(tenantEntity.getTenantId()+"--"+memberCard.getId()+"--微信商圈同步会员积分{}"+resultData.message);
}

}
}

+ 0
- 38
suimangService/src/main/java/com/iformall/service/msg/impl/SyncMemberCardMsgServiceImpl.java 파일 보기

@@ -1,38 +0,0 @@
package com.iformall.service.msg.impl;

import com.iformall.common.ResultData;
import com.iformall.domain.po.base.TenantEntity;
import com.iformall.domain.po.msg.BaseMsg;
import com.iformall.domain.po.msg.SyncMemberCardMsg;
import com.iformall.service.WxMemberCardService;
import com.iformall.service.msg.MsgSendService;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;

/**
*
*/
@Service
public class SyncMemberCardMsgServiceImpl implements MsgSendService {

private final Logger logger = LoggerFactory.getLogger(this.getClass());

@Autowired
private WxMemberCardService wxMemberCardService;


@Override
public void send(BaseMsg baseMsg) throws Exception{
SyncMemberCardMsg syncMemberCardMsg = (SyncMemberCardMsg)baseMsg;

TenantEntity tenantEntity = new TenantEntity();
tenantEntity.setTenantId(syncMemberCardMsg.getTenantId());
tenantEntity.setParentTenantId(syncMemberCardMsg.getParentTenantId());

ResultData resultData = wxMemberCardService.syncMemberCard(tenantEntity, syncMemberCardMsg.getCardId(), syncMemberCardMsg.getCode());
logger.info(tenantEntity.getTenantId()+"--"+syncMemberCardMsg.getCode()+"--微信商圈同步会员卡{}"+resultData.message);

}
}

불러오는 중...
취소
저장