修改订单API下的Task 增加礼物的Task显示

修改转换器
This commit is contained in:
chfei committed 2026-08-24 18:14:31 +08:00
1 parent 9e71c54414
commit b512ee992f
3 files changed
+340 -48

No files matched your search

@@ -713,10 +713,6 @@ namespace KJD_Web.BLL.WXXD
string conn = System.Configuration.ConfigurationManager.ConnectionStrings["ConnKJD"].ConnectionString;
MysqlUtils mySql = new MysqlUtils(conn);
if (orderNo.Contains("3738552208766960384"))
{
}
string sql = "";
count = -1;
@@ -2177,18 +2173,81 @@ namespace KJD_Web.BLL.WXXD
if (!WXUserManage.GetSign(inputData))
return "{\"code\":999,\"msg\":\"签名校验失败\"}";
var user_name = RegexUtils.GetStringQuery(ref inputData, "user_name");
string shop_ids = RegexUtils.GetStringQuery(ref inputData, "shop_ids")?.Replace("'", "");//所有店铺信息
if (string.IsNullOrEmpty(shop_ids))
throw new ArgumentException("请选择店铺");
List<string> shopIdLst = shop_ids.Split(',').ToList();
if (shopIdLst.Count > 0)
shop_ids = "'" + string.Join("','", shopIdLst) + "'";
string start_Time = RegexUtils.GetStringQuery(ref inputData, "start_time")?.Replace("'", "");
string end_Time = RegexUtils.GetStringQuery(ref inputData, "end_time")?.Replace("'", "");
DateTime startTime = DateTime.Now.AddDays(-7);
DateTime endTime = DateTime.Now;
if (!string.IsNullOrEmpty(start_Time))
startTime = TimeUtils.StampMillisecondsToDateTime(start_Time.ParseToLong());
if (!string.IsNullOrEmpty(end_Time))
endTime = TimeUtils.StampMillisecondsToDateTime(end_Time.ParseToLong());
if (endTime <= startTime)
throw new ArgumentException("结束时间必须大于开始时间");
//if (endTime > startTime.AddDays(10))
// throw new ArgumentException("时间范围不能超过10天");
int startTimestamp = TimeUtils.DateTimeToTimestampSeconds(startTime);
int endTimestamp = TimeUtils.DateTimeToTimestampSeconds(endTime);
var timeCalc = DateTime.Now;
string conn = System.Configuration.ConfigurationManager.ConnectionStrings["ConnKJD"].ConnectionString;
MysqlUtils mySql = new MysqlUtils(conn);
// ---------- 1. 查主任务 ----------
string taskSql = $"SELECT A.id, A.task_type, A.task_describe, A.shop_ids, B.`name` as shop_name, A.object_ids, A.sub_task_num, A.success_task_num, A.fail_task_num, A.`status`, A.create_by, A.update_by, A.remark, A.task_fail_reason, A.create_time, A.update_time FROM erp.o_user_operate_task AS A INNER JOIN erp.o_shop AS B ON A.shop_ids = B.id WHERE task_type in(25,31) AND A.create_by = '{user_name}' ORDER BY create_time DESC, id DESC; ";
StringBuilder sbTask = new StringBuilder();
sbTask.Append("SELECT ");
sbTask.Append("A.id, ");
sbTask.Append("A.task_type, ");
sbTask.Append("A.task_describe, ");
sbTask.Append("A.shop_ids, ");
sbTask.Append("C.name AS shop_name, ");
sbTask.Append("A.object_ids, ");
sbTask.Append("A.sub_task_num, ");
sbTask.Append("A.success_task_num, ");
sbTask.Append("A.fail_task_num, ");
sbTask.Append("A.status, ");
sbTask.Append("A.create_by, ");
sbTask.Append("A.update_by, ");
sbTask.Append("A.remark, ");
sbTask.Append("A.task_fail_reason, ");
sbTask.Append("A.create_time, ");
sbTask.Append("A.update_time ");
sbTask.Append("FROM erp.o_user_operate_task AS A ");
sbTask.Append("INNER JOIN erp.o_shop AS C ON A.shop_ids = C.id ");
sbTask.Append("WHERE A.task_type IN (25, 31, 36) ");
// 时间条件
{
sbTask.Append("AND A.create_time BETWEEN '");
sbTask.Append(startTime);
sbTask.Append("' AND '");
sbTask.Append(endTime);
sbTask.Append("' ");
}
// 店铺条件
if (!string.IsNullOrEmpty(shop_ids))
{
sbTask.Append("AND A.shop_ids IN (");
sbTask.Append(shop_ids);
sbTask.Append(") ");
}
sbTask.Append("ORDER BY A.create_time DESC, A.id DESC;");
DataTable taskDt = null;
try
{
taskDt = mySql.ExecuteDataTable(taskSql);
taskDt = mySql.ExecuteDataTable(sbTask.ToString());
}
catch (Exception ex)
{
@@ -2221,30 +2280,180 @@ namespace KJD_Web.BLL.WXXD
task_fail_reason = row["task_fail_reason"].ParseToNullableString(),
create_time = row["create_time"].ParseToString().ParseToDateTimeNullable(),
update_time = row["update_time"].ParseToString().ParseToDateTimeNullable(),
sub_tasks = new List<user_operate_sub_task_info>() // 初始化子任务列表
};
orderList.Add(g);
}
JsonSerializerSettings jsonSetting = new JsonSerializerSettings { NullValueHandling = NullValueHandling.Ignore };
var data = JsonUtils.SerializeObjectToString(orderList.Select(a => new {
id = a.id,
taskType = a.task_type,
taskDescribe = a.task_describe,
ShopId = a.shop_ids,
shopName = a.shop_name,
ObjectIds = a.object_ids,
subTaskNum = a.sub_task_num,
successTaskNum = a.success_task_num,
failTaskNum = a.fail_task_num,
status = a.status,
createBy = a.create_by,
updateBy = a.update_by,
remark = a.remark,
taskFailReason = a.task_fail_reason,
createTime = a.create_time,
updateTime = a.update_time
}), jsonSetting);
var seconds = (DateTime.Now - timeCalc).TotalSeconds.ToString("0.000");
return "{\"code\":200,\"msg\":\"success\",\"data\":" + data + "}";
List<long> taskIdList = orderList.Select(x => x.id).ToList();
if (taskIdList.Count > 0)
{
StringBuilder sbSubTask = new StringBuilder();
sbSubTask.Append("SELECT ");
sbSubTask.Append("id, ");
sbSubTask.Append("task_id, ");
sbSubTask.Append("platform_code, ");
sbSubTask.Append("shop_id, ");
sbSubTask.Append("platform_object_id, ");
sbSubTask.Append("object_id, ");
sbSubTask.Append("platform_resp_code, ");
sbSubTask.Append("platform_resp_msg, ");
sbSubTask.Append("platform_resp_data, ");
sbSubTask.Append("sys_msg, ");
sbSubTask.Append("CAST(`status` AS SIGNED) AS `status`, ");
sbSubTask.Append("audit_result, ");
sbSubTask.Append("audit_reason, ");
sbSubTask.Append("create_time, ");
sbSubTask.Append("create_by, ");
sbSubTask.Append("update_time, ");
sbSubTask.Append("update_by ");
sbSubTask.Append("FROM erp.o_user_operate_sub_task ");
sbSubTask.Append("WHERE task_id IN (");
for (int i = 0; i < taskIdList.Count; i++)
{
if (i > 0)
{
sbSubTask.Append(", ");
}
sbSubTask.Append(taskIdList[i]);
}
sbSubTask.Append(") ");
sbSubTask.Append("ORDER BY task_id, create_time DESC;");
DataTable subTaskDt = null;
try
{
subTaskDt = mySql.ExecuteDataTable(sbSubTask.ToString());
}
catch (Exception ex)
{
return "{\"code\":500,\"msg\":\"" + ex.Message + "\",\"data\":[],\"count\":" + 0 + "}";
}
// 按task_id分组存储子任务
Dictionary<long, List<user_operate_sub_task_info>> subTaskDict = new Dictionary<long, List<user_operate_sub_task_info>>();
if (subTaskDt != null)
{
foreach (DataRow row in subTaskDt.Rows)
{
var subTask = new user_operate_sub_task_info
{
id = row["id"].ParseToLong(),
task_id = row["task_id"].ParseToLong(),
platform_code = row["platform_code"].ParseToNullableString(),
shop_id = row["shop_id"].ParseToLong(),
platform_object_id = row["platform_object_id"].ParseToNullableString(),
object_id = row["object_id"].ParseToNullableString(),
platform_resp_code = row["platform_resp_code"].ParseToNullableString(),
platform_resp_msg = row["platform_resp_msg"].ParseToNullableString(),
platform_resp_data = row["platform_resp_data"].ParseToNullableString(),
sys_msg = row["sys_msg"].ParseToNullableString(),
status = row["status"].ParseToInt(),
audit_result = row["audit_result"].ParseToNullableInt(),
audit_reason = row["audit_reason"].ParseToNullableString(),
create_time = row["create_time"].ParseToString().ParseToDateTimeNullable(),
create_by = row["create_by"].ParseToNullableString(),
update_time = row["update_time"].ParseToString().ParseToDateTimeNullable(),
update_by = row["update_by"].ParseToNullableString()
};
long taskId = subTask.task_id;
if (!subTaskDict.ContainsKey(taskId))
{
subTaskDict[taskId] = new List<user_operate_sub_task_info>();
}
subTaskDict[taskId].Add(subTask);
}
// 将子任务列表赋值给对应的主任务
foreach (var task in orderList)
{
if (subTaskDict.ContainsKey(task.id))
{
task.sub_tasks = subTaskDict[task.id];
}
}
}
// ---------- 3. 合并错误信息到主任务 ----------
foreach (var task in orderList)
{
List<string> errorList = new List<string>();
// 主任务错误
if (!string.IsNullOrEmpty(task.task_fail_reason))
{
errorList.Add(task.task_fail_reason);
}
// 获取该任务的子任务列表
if (subTaskDict.ContainsKey(task.id))
{
var subTasks = subTaskDict[task.id];
// 对于36类型,子任务可能有更详细的错误
if (task.task_type == 36)
{
foreach (var subTask in subTasks)
{
// 子任务失败的错误信息
if (subTask.status == 2 && !string.IsNullOrEmpty(subTask.sys_msg))
{
errorList.Add(subTask.sys_msg);
}
// 审核不通过的原因
if (subTask.audit_result == 2 && !string.IsNullOrEmpty(subTask.audit_reason))
{
errorList.Add("审核不通过:" + subTask.audit_reason);
}
}
}
else
{
// 25、31类型,如果主任务没有错误,但子任务有错误,也收集
foreach (var subTask in subTasks)
{
if (subTask.status == 2 && !string.IsNullOrEmpty(subTask.sys_msg))
{
errorList.Add(subTask.sys_msg);
}
}
}
}
// 合并错误信息(去重)
task.task_fail_reason = errorList
.Where(x => !string.IsNullOrEmpty(x))
.Distinct()
.ToList()
.Count > 0 ? string.Join("; ", errorList.Distinct()) : null;
}
}
JsonSerializerSettings jsonSetting = new JsonSerializerSettings
{
NullValueHandling = NullValueHandling.Ignore,
ContractResolver = new DefaultContractResolver
{
// 核心:设置命名策略为 SnakeCaseNamingStrategy
// 这样序列化时,ProjectId 会变成 "project_id";
// 反序列化时,"project_id" 也能正确映射回 ProjectId
NamingStrategy = new SnakeCaseNamingStrategy()
}
};
string jsonResult = JsonConvert.SerializeObject(new
{
code = 200,
msg = "success",
data = orderList,
count = orderList.Count
}, jsonSetting);
return jsonResult;
}