Explorar el Código

Merge branch 'sub_func' into pre

zoujiajian hace 2 años
padre
commit
f150c92cca

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

@@ -97,7 +97,7 @@ public class DistributeMoneyApply extends BaseEntity {
 	@Getter
 	public enum MType {
 		ds("用户分销"),
-		sub("下级渠道分销"),
+		sub("邀请奖励"),
 		;
 		String desc;
 

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

@@ -556,7 +556,8 @@ public class DistributeServiceImpl implements DistributeService {
 			}
 			UserDistribute superUser = userDistributeMapper.selectOne(Wrappers.lambdaQuery(UserDistribute.class)
 					.eq(UserDistribute::getUserId, userDistributeSub.getUserId())
-					.eq(UserDistribute::getDeleted, 1));
+					.eq(UserDistribute::getDeleted, 1)
+					.last("limit 1"));
 			if (superUser == null) {
 				throw BusinessRuntimeException.getInstance("上级渠道不存在");
 			}

+ 1 - 1
netflix-web/src/main/java/com/cyksj/web/controller/sys/SysConfigController.java

@@ -213,7 +213,7 @@ public class SysConfigController {
 	/**
 	 * 清零用户获取广告记录
 	 */
-	@DeleteMapping("/delte/cps/ad")
+	@DeleteMapping("/delete/cps/ad")
 	public Result<String> deleteCpsAdRecord() {
 		cpsUserAdRecordMapper.delete(null);
 		return GatewayResponse.SUCCESS.newBuilder().toResult();