zoujiajian преди 3 години
родител
ревизия
41449727f3

+ 1 - 1
netflix-dao/src/main/java/com/cyksj/model/views/UserDistributeView.java

@@ -35,6 +35,6 @@ public class UserDistributeView {
 	@DbField("gd.type")
 	private Integer type;
 
-	@DbField("gd.second_rate")
+	@DbField("up.second_rate")
 	private Integer secondRate;
 }

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

@@ -80,7 +80,7 @@ public class DistributeServiceImpl implements DistributeService {
 				throw new BusinessRuntimeException("比例错误");
 			}
 			GoodsDon goodsDon = goodsDonMapper.selectById(rate.getGoodsId());
-			if (rate.getId() != null) {
+			if (rate.getId() != null && (goodsDon == null || !goodsDon.getDeleted())) {
 				userPlatDistributeRateMapper.deleteById(rate.getId());
 				continue;
 			}