Merge branch 'sub_func' into dev

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;
 

netflix-web/src/main/java/com/cyksj/web/controller/cps/CpsBackLoginController.java

@@ -174,7 +174,7 @@ public class CpsBackLoginController {
 		if (cpsUserAdRecord == null) {
 			SysConfig sysConfig = sysConfigMapper.selectOne(Wrappers.lambdaQuery(SysConfig.class)
 					.eq(SysConfig::getSysKey, key).last("limit 1"));
-			if (sysConfig == null) return GatewayResponse.SUCCESS.newBuilder().toResult(sysConfig.getSysValue());
+			if (sysConfig != null) return GatewayResponse.SUCCESS.newBuilder().toResult(sysConfig.getSysValue());
 		}
 		return GatewayResponse.SUCCESS.newBuilder().toResult();
 	}

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();