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

Commit 1bf010ed authored by 张国柄's avatar 张国柄

fix:会员购买价格使用及回调处理规则;

parent 73ecf2b3
...@@ -139,6 +139,7 @@ public class AdamMemberOrderServiceImpl implements IAdamMemberOrderService { ...@@ -139,6 +139,7 @@ public class AdamMemberOrderServiceImpl implements IAdamMemberOrderService {
memberOrderVo.setState(0);// 0-待支付 memberOrderVo.setState(0);// 0-待支付
memberOrderVo.setUid(currentUid); memberOrderVo.setUid(currentUid);
memberOrderVo.setPrice(param.getPrice()); memberOrderVo.setPrice(param.getPrice());
memberOrderVo.setPricePaid(paymentPrice);
memberOrderVo.setClientIp(clientIp); memberOrderVo.setClientIp(clientIp);
String headerCliVersion = CurrentUtil.getHeaderCliVersion(), headerCliSource = CurrentUtil.getHeaderCliSource(); String headerCliVersion = CurrentUtil.getHeaderCliVersion(), headerCliSource = CurrentUtil.getHeaderCliSource();
memberOrderVo.setSource(null == headerCliSource ? "" : headerCliSource); memberOrderVo.setSource(null == headerCliSource ? "" : headerCliSource);
...@@ -201,11 +202,10 @@ public class AdamMemberOrderServiceImpl implements IAdamMemberOrderService { ...@@ -201,11 +202,10 @@ public class AdamMemberOrderServiceImpl implements IAdamMemberOrderService {
if (1 == shotMemberOrderVo.getState() || 3 == shotMemberOrderVo.getState()) { if (1 == shotMemberOrderVo.getState() || 3 == shotMemberOrderVo.getState()) {
return ResponseDto.failure(ErrorMapping.get("10502"), parameter); return ResponseDto.failure(ErrorMapping.get("10502"), parameter);
} }
// 因不同阶段用户购买金额不一样,这里不方便判断实际取值,停用金额校验 if (parameter.getPrice().compareTo(shotMemberOrderVo.getPricePaid()) != 0) {
// if (parameter.getPrice().compareTo(shotMemberOrderVo.getPrice()) != 0) { // 订单金额比对
// // 订单金额比对 return ResponseDto.failure(ErrorMapping.get("10503"), parameter);
// return ResponseDto.failure(ErrorMapping.get("10503"), parameter); }
// }
AdamMemberPriceVo memberPriceVo = adamRdmService.getMemberPriceVoByPriceId( AdamMemberPriceVo memberPriceVo = adamRdmService.getMemberPriceVoByPriceId(
shotMemberOrderVo.getMemberId(), shotMemberOrderVo.getMemberPriceId()); shotMemberOrderVo.getMemberId(), shotMemberOrderVo.getMemberPriceId());
if (null == memberPriceVo) { if (null == memberPriceVo) {
......
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