zoujiajian 2 年之前
父节点
当前提交
a2a1d945ae

+ 1 - 1
netflix-dao/src/main/java/com/cyksj/model/entity/UserDistributeEquipment.java

@@ -26,7 +26,7 @@ public class UserDistributeEquipment extends BaseEntity{
 	/**
 	 * Apple TV 提成
 	 */
-	private BigDecimal acTv;
+	private BigDecimal apTv;
 
 	/**
 	 * 套餐提成

+ 3 - 3
netflix-service/src/main/java/com/cyksj/service/distribute/impl/DistributeServiceImpl.java

@@ -508,12 +508,12 @@ public class DistributeServiceImpl implements DistributeService {
 			epRate.setUserId(userId);
 			epRate.setDistributeId(distributeId);
 			BigDecimal ep = epRate.getEp();
-			BigDecimal acTv = epRate.getAcTv();
+			BigDecimal apTv = epRate.getApTv();
 			BigDecimal combo = epRate.getCombo();
-			if (ep == null || acTv == null || combo == null) {
+			if (ep == null || apTv == null || combo == null) {
 				throw BusinessRuntimeException.getInstance("请填写设备分销必填项..");
 			}
-			if (ep.compareTo(zero) <= 0 || acTv.compareTo(zero) <= 0 || combo.compareTo(zero) <= 0 || combo.compareTo(BigDecimal.valueOf(100)) >= 0) {
+			if (ep.compareTo(zero) <= 0 || apTv.compareTo(zero) <= 0 || combo.compareTo(zero) <= 0 || combo.compareTo(BigDecimal.valueOf(100)) >= 0) {
 				throw BusinessRuntimeException.getInstance("请输入正确的设备分销设置");
 			}
 			if (epRate.getId() != null) {

+ 1 - 1
netflix-service/src/main/java/com/cyksj/service/order/impl/OrderDonServiceImpl.java

@@ -2818,7 +2818,7 @@ public class OrderDonServiceImpl extends ServiceImpl<OrderDonMapper, OrderDon> i
 			List<Integer> specIdsList = Jsons.parseList(goodsDonSku.getSpecIds(), Integer.class);
 			//包含Apple TV
 			if (goodsDonSku.getSpecJson().contains("TV")) {
-				takeMoney = takeMoney.add(userDistributeEquipment.getAcTv());
+				takeMoney = takeMoney.add(userDistributeEquipment.getApTv());
 			}
 			//包含套餐
 			if (goodsDonSku.getSpecJson().contains("套餐")) {