记得上下班打卡 | git大法好，push需谨慎

Skip to content

L
liquidnet-bus-v1
Commit 9ed5595b authored by 胡佳晨's avatar 胡佳晨
Browse files
Options

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

parents b4b6fcf7 40e1fc01
Hide whitespace changes
Inline Side-by-side
Showing with 43 additions and 32 deletions
liquidnet-bus-service/liquidnet-service-adam/liquidnet-service-adam-impl/src/main/java/com/liquidnet/service/adam/service/impl/AdamMemberOrderServiceImpl.java
View file @ 9ed5595b
......@@ -19,6 +19,7 @@ import com.liquidnet.service.base.ResponseDto;
import com.liquidnet.service.base.SqlMapping;
import com.liquidnet.service.base.constant.MQConst;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.core.env.Environment;
import org.springframework.stereotype.Service;
......@@ -61,7 +62,7 @@ public class AdamMemberOrderServiceImpl implements IAdamMemberOrderService {
LocalDateTime now = LocalDateTime.now();
String nowStr = DateUtil.Formatter.yyyyMMddHHmmss.format(now);
String orderNo = IDGenerator.nextSnowId().toString().concat("V");
String orderNo = IDGenerator.nextSnowId().concat("V");
String clientIp = CurrentUtil.getCliIpAddr();
// 调取对应支付接口
......@@ -198,7 +199,8 @@ public class AdamMemberOrderServiceImpl implements IAdamMemberOrderService {
AdamMemberCodeVo initMemberCodeVo = null;
AdamUserMemberVo existUserMemberVo = null;
try {
AdamMemberOrderVo handleMemberOrderVo = shotMemberOrderVo;
AdamMemberOrderVo handleMemberOrderVo = AdamMemberOrderVo.getNew();
BeanUtils.copyProperties(shotMemberOrderVo, handleMemberOrderVo);
LinkedList<String> toMqSqls = CollectionUtil.linkedListString();
LinkedList<Object[]> operationObjs = CollectionUtil.linkedListObjectArr(),
updateMemberOrderObjs = CollectionUtil.linkedListObjectArr();
......@@ -231,8 +233,9 @@ public class AdamMemberOrderServiceImpl implements IAdamMemberOrderService {
initUserMemberVo.getState(), initUserMemberVo.getExpiryAt(), initUserMemberVo.getCreatedAt()
});
} else {// 续费
AdamUserMemberVo updateExistUserMemberVo = existUserMemberVo;
LocalDateTime currentExpiryAt = updateExistUserMemberVo.getExpiryAt();
AdamUserMemberVo updateExistUserMemberVo = AdamUserMemberVo.getNew();
BeanUtils.copyProperties(existUserMemberVo, updateExistUserMemberVo);
LocalDateTime currentExpiryAt = existUserMemberVo.getExpiryAt();
LocalDateTime expiryAt = (currentExpiryAt.isBefore(now) ? now : currentExpiryAt).plusDays(memberPriceVo.getDays()).with(LocalTime.MAX);
// long s = System.currentTimeMillis();
......@@ -324,9 +327,9 @@ public class AdamMemberOrderServiceImpl implements IAdamMemberOrderService {
shotMemberOrderVo.getUid(), adamRdmService.getMemberOrderVosByUid(shotMemberOrderVo.getUid()), shotMemberOrderVo.getOrderNo());
adamRdmService.setShotMemberOrderVoByOrderNo(shotMemberOrderVo.getOrderNo(), shotMemberOrderVo);
if (0 == shotMemberOrderVo.getMode()) {// 购买会员回调
if (null == existUserMemberVo) {
if (null == existUserMemberVo) {// 新会员
adamRdmService.delUserMemberVoByUid(shotMemberOrderVo.getUid());
} else {
} else {// 已是会员
adamRdmService.setUserMemberVoByUid(shotMemberOrderVo.getUid(), existUserMemberVo);
}
}
......@@ -349,6 +352,8 @@ public class AdamMemberOrderServiceImpl implements IAdamMemberOrderService {
List<AdamMemberOrderVo> memberOrderVos = null;
AdamMemberOrderVo initMemberOrderVo = null;
AdamUserMemberVo existUserMemberVo = null;
AdamUserMemberVo initUserMemberVo = null;
try {
adamRdmService.delMemberCodeVoByCode(param.getMemberCode());
if (memberCodeVo.getState() != 0) {
......@@ -389,52 +394,56 @@ public class AdamMemberOrderServiceImpl implements IAdamMemberOrderService {
LinkedList<Object[]> updateMemberCodeObjs = CollectionUtil.linkedListObjectArr(),
initMemberOrderObjs = CollectionUtil.linkedListObjectArr(),
upsertUserMemberObjs = CollectionUtil.linkedListObjectArr();
AdamUserMemberVo upsertUserMemberVo = adamRdmService.getUserMemberVoByUid(initMemberOrderVo.getUid());
if (null != upsertUserMemberVo) {
upsertUserMemberVo.setState(1);
LocalDateTime expiryAt = upsertUserMemberVo.getExpiryAt();
upsertUserMemberVo.setExpiryAt(
existUserMemberVo = adamRdmService.getUserMemberVoByUid(initMemberOrderVo.getUid());
if (null != existUserMemberVo) {// 已是会员
AdamUserMemberVo updateExistUserMemberVo = AdamUserMemberVo.getNew();
BeanUtils.copyProperties(existUserMemberVo, updateExistUserMemberVo);
updateExistUserMemberVo.setState(1);
LocalDateTime expiryAt = existUserMemberVo.getExpiryAt();
updateExistUserMemberVo.setExpiryAt(
(expiryAt.isBefore(now) ? now : expiryAt).plusDays(initMemberOrderVo.getDays()).with(LocalTime.MAX)
);
// long s = System.currentTimeMillis();
// mongoTemplate.getCollection(AdamUserMemberVo.class.getSimpleName()).updateOne(
// Query.query(Criteria.where("uid").is(upsertUserMemberVo.getUid())).getQueryObject(),
// new Document("$set", new Document("expiryAt", upsertUserMemberVo.getExpiryAt()).append("state", 1))
// Query.query(Criteria.where("uid").is(updateExistUserMemberVo.getUid())).getQueryObject(),
// new Document("$set", new Document("expiryAt", updateExistUserMemberVo.getExpiryAt()).append("state", 1))
// );
// log.debug("#MDB耗时:{}ms", System.currentTimeMillis() - s);
toMqSqls.add(SqlMapping.get("adam_user_member.update"));
upsertUserMemberObjs.add(new Object[]{
upsertUserMemberVo.getState(), upsertUserMemberVo.getExpiryAt(), now, upsertUserMemberVo.getUid()
updateExistUserMemberVo.getState(), updateExistUserMemberVo.getExpiryAt(), now, updateExistUserMemberVo.getUid()
});
} else {
upsertUserMemberVo = AdamUserMemberVo.getNew();
upsertUserMemberVo.setUid(initMemberOrderVo.getUid());
upsertUserMemberVo.setMemberId(memberCodeVo.getMemberId());
upsertUserMemberVo.setMemberNo(memberCodeVo.getMemberNo());
upsertUserMemberVo.setState(1);
upsertUserMemberVo.setExpiryAt(now.plusDays(initMemberOrderVo.getDays()).with(LocalTime.MAX));
upsertUserMemberVo.setCreatedAt(now);
adamRdmService.setUserMemberVoByUid(initMemberOrderVo.getUid(), updateExistUserMemberVo);
} else {// 新会员
initUserMemberVo = AdamUserMemberVo.getNew();
initUserMemberVo.setUid(initMemberOrderVo.getUid());
initUserMemberVo.setMemberId(memberCodeVo.getMemberId());
initUserMemberVo.setMemberNo(memberCodeVo.getMemberNo());
initUserMemberVo.setState(1);
initUserMemberVo.setExpiryAt(now.plusDays(initMemberOrderVo.getDays()).with(LocalTime.MAX));
initUserMemberVo.setCreatedAt(now);
// long s = System.currentTimeMillis();
// mongoTemplate.insert(upsertUserMemberVo, AdamUserMemberVo.class.getSimpleName());
// mongoTemplate.insert(initUserMemberVo, AdamUserMemberVo.class.getSimpleName());
// log.debug("#MDB耗时:{}ms", System.currentTimeMillis() - s);
toMqSqls.add(SqlMapping.get("adam_user_member.add"));
upsertUserMemberObjs.add(new Object[]{
upsertUserMemberVo.getUid(), upsertUserMemberVo.getMemberId(), upsertUserMemberVo.getMemberNo(),
upsertUserMemberVo.getState(), upsertUserMemberVo.getExpiryAt(), upsertUserMemberVo.getCreatedAt()
initUserMemberVo.getUid(), initUserMemberVo.getMemberId(), initUserMemberVo.getMemberNo(),
initUserMemberVo.getState(), initUserMemberVo.getExpiryAt(), initUserMemberVo.getCreatedAt()
});
adamRdmService.setUserMemberVoByUid(initMemberOrderVo.getUid(), initUserMemberVo);
}
long s = System.currentTimeMillis();
memberOrderVos = adamRdmService.getMemberOrderVosByUid(initMemberOrderVo.getUid());
adamRdmService.addMemberOrderVoByUid(initMemberOrderVo.getUid(), memberOrderVos, initMemberOrderVo);
adamRdmService.setUserMemberVoByUid(initMemberOrderVo.getUid(), upsertUserMemberVo);
// adamRdmService.delMemberCodeVoByCode(memberCodeVo.getCode());
log.debug("#RDS耗时:{}ms", System.currentTimeMillis() - s);
// Document updateMemberCodeVo = new Document("state", 1)
// .append("updatedAt", now)
// .append("useOrderNo", initMemberOrderVo.getOrderNo())
// .append("useUid", upsertUserMemberVo.getUid())
// .append("useUid", initMemberOrderVo.getUid())
// .append("useAt", now);
// s = System.currentTimeMillis();
// mongoTemplate.getCollection(AdamMemberCodeVo.class.getSimpleName()).updateOne(
......@@ -444,7 +453,7 @@ public class AdamMemberOrderServiceImpl implements IAdamMemberOrderService {
// log.debug("#MDB耗时:{}ms", System.currentTimeMillis() - s);
toMqSqls.add(SqlMapping.get("adam_member_code.exchange"));
updateMemberCodeObjs.add(new Object[]{
1, now, initMemberOrderVo.getOrderNo(), upsertUserMemberVo.getUid(), now, memberCodeVo.getCode()
1, now, initMemberOrderVo.getOrderNo(), initMemberOrderVo.getUid(), now, memberCodeVo.getCode()
});
// s = System.currentTimeMillis();
......@@ -470,7 +479,11 @@ public class AdamMemberOrderServiceImpl implements IAdamMemberOrderService {
adamRdmService.setMemberCodeVoByCode(memberCodeVo.getCode(), memberCodeVo);
if (null != initMemberOrderVo) {
adamRdmService.delUserMemberVoByUid(initMemberOrderVo.getUid());
if (null != existUserMemberVo) {// 已是会员
adamRdmService.setUserMemberVoByUid(initMemberOrderVo.getUid(), existUserMemberVo);
} else {// 新会员
adamRdmService.delUserMemberVoByUid(initMemberOrderVo.getUid());
}
adamRdmService.rmvMemberOrderVoByUid(initMemberOrderVo.getUid(), memberOrderVos, initMemberOrderVo.getOrderNo());
}
return ResponseDto.failure(ErrorMapping.get("10214"));
......@@ -504,9 +517,7 @@ public class AdamMemberOrderServiceImpl implements IAdamMemberOrderService {
if (!CollectionUtils.isEmpty(orderVos)) {
ArrayList<AdamMemberOrderSimpleVo> vos = ObjectUtil.getAdamMemberOrderSimpleVoArrayList();
orderVos.forEach(r -> {
vos.add(AdamMemberOrderSimpleVo.getNew().copy(r));
});
orderVos.forEach(r -> vos.add(AdamMemberOrderSimpleVo.getNew().copy(r)));
pagedResult.setTotal(orderVos.size(), 20);
pagedResult.setList(vos);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment