Merge branch 'master' of http://git.dayaedu.com/yonge/mec

mec-biz/src/main/java/com/ym/mec/biz/service/impl/VipGroupServiceImpl.java

@@ -1301,35 +1301,37 @@ public class VipGroupServiceImpl extends BaseServiceImpl<Long, VipGroup> impleme
 
 		//插入缴费明细
 		//收入
-		SysUserCashAccountDetail sysUserIncomeCashAccountDetail = new SysUserCashAccountDetail();
-		sysUserIncomeCashAccountDetail.setUserId(userId);
-		sysUserIncomeCashAccountDetail.setType(PlatformCashAccountDetailTypeEnum.RECHARGE);
-		sysUserIncomeCashAccountDetail.setStatus(DealStatusEnum.SUCCESS);
-		sysUserIncomeCashAccountDetail.setAmount(order.getActualAmount());
-		sysUserIncomeCashAccountDetail.setBalance(sysUserCashAccount.getBalance().add(order.getActualAmount()));
-		sysUserIncomeCashAccountDetail.setAttribute(order.getTransNo());
-		sysUserIncomeCashAccountDetail.setChannel(studentPaymentOrder.getPaymentChannel());
-		sysUserIncomeCashAccountDetail.setComAmount(studentPaymentOrder.getComAmount());
-		sysUserIncomeCashAccountDetail.setPerAmount(studentPaymentOrder.getPerAmount());
-
-		//支出
-		SysUserCashAccountDetail sysUserExpendCashAccountDetail = new SysUserCashAccountDetail();
-		sysUserExpendCashAccountDetail.setUserId(userId);
-		sysUserExpendCashAccountDetail.setType(PlatformCashAccountDetailTypeEnum.PAY_FEE);
-		sysUserExpendCashAccountDetail.setStatus(DealStatusEnum.SUCCESS);
-		sysUserExpendCashAccountDetail.setAmount(order.getActualAmount().negate());
-		sysUserExpendCashAccountDetail.setBalance(sysUserCashAccount.getBalance());
-		sysUserExpendCashAccountDetail.setAttribute(order.getTransNo());
-		sysUserExpendCashAccountDetail.setChannel(studentPaymentOrder.getPaymentChannel());
-		if(studentPaymentOrder.getComAmount() != null){
-			sysUserExpendCashAccountDetail.setComAmount(studentPaymentOrder.getComAmount().negate());
-		}
-		if(studentPaymentOrder.getPerAmount() != null){
-			sysUserExpendCashAccountDetail.setPerAmount(studentPaymentOrder.getPerAmount().negate());
-		}
-
-		sysUserCashAccountDetailService.insert(sysUserIncomeCashAccountDetail);
-		sysUserCashAccountDetailService.insert(sysUserExpendCashAccountDetail);
+		if(Objects.nonNull(order.getActualAmount())&&order.getActualAmount().compareTo(BigDecimal.ZERO)!=0){
+			SysUserCashAccountDetail sysUserIncomeCashAccountDetail = new SysUserCashAccountDetail();
+			sysUserIncomeCashAccountDetail.setUserId(userId);
+			sysUserIncomeCashAccountDetail.setType(PlatformCashAccountDetailTypeEnum.RECHARGE);
+			sysUserIncomeCashAccountDetail.setStatus(DealStatusEnum.SUCCESS);
+			sysUserIncomeCashAccountDetail.setAmount(order.getActualAmount());
+			sysUserIncomeCashAccountDetail.setBalance(sysUserCashAccount.getBalance().add(order.getActualAmount()));
+			sysUserIncomeCashAccountDetail.setAttribute(order.getTransNo());
+			sysUserIncomeCashAccountDetail.setChannel(studentPaymentOrder.getPaymentChannel());
+			sysUserIncomeCashAccountDetail.setComAmount(studentPaymentOrder.getComAmount());
+			sysUserIncomeCashAccountDetail.setPerAmount(studentPaymentOrder.getPerAmount());
+
+			//支出
+			SysUserCashAccountDetail sysUserExpendCashAccountDetail = new SysUserCashAccountDetail();
+			sysUserExpendCashAccountDetail.setUserId(userId);
+			sysUserExpendCashAccountDetail.setType(PlatformCashAccountDetailTypeEnum.PAY_FEE);
+			sysUserExpendCashAccountDetail.setStatus(DealStatusEnum.SUCCESS);
+			sysUserExpendCashAccountDetail.setAmount(order.getActualAmount().negate());
+			sysUserExpendCashAccountDetail.setBalance(sysUserCashAccount.getBalance());
+			sysUserExpendCashAccountDetail.setAttribute(order.getTransNo());
+			sysUserExpendCashAccountDetail.setChannel(studentPaymentOrder.getPaymentChannel());
+			if(studentPaymentOrder.getComAmount() != null){
+				sysUserExpendCashAccountDetail.setComAmount(studentPaymentOrder.getComAmount().negate());
+			}
+			if(studentPaymentOrder.getPerAmount() != null){
+				sysUserExpendCashAccountDetail.setPerAmount(studentPaymentOrder.getPerAmount().negate());
+			}
+
+			sysUserCashAccountDetailService.insert(sysUserIncomeCashAccountDetail);
+			sysUserCashAccountDetailService.insert(sysUserExpendCashAccountDetail);
+		}
 		Map<Integer,String> map = new HashMap<>(1);
 		map.put(userId,userId.toString());
 		sysMessageService.batchSendMessage(MessageSenderPluginContext.MessageSender.JIGUANG, MessageTypeEnum.STUDENT_PUSH_VIP_BUY, map, null, 0, "2","STUDENT",