mirror of
http://git.coreshop.cn/jianweie/coreshoppro.git
synced 2025-12-06 16:23:26 +08:00
# 2022-02-09
### 1.3.5 开源社区版（会员专业版同步修改）： 无 ### 0.1.5 会员专业版： 【升级】nuget升级常用组件到最新版本。 【修复】服务商品列表图片组件从image调整为u--image组件。#I4RUC6 【优化】规范coreshop-goods.vue组件for循环未定义key的问题。 【修复】修复因升级uview版本导致【商品选项卡goodTabBar组件】切换失效的问题。 【新增】微信自定义交易组件增加【商品审核结果回调】，【类目审核结果回调】微信服务器消息推送处理。 【优化】调整自定义交易组件sku价格为decimal(18, 2)类型，方便小数处理。 【优化】微信自定义交易组件增加图片同步至微信侧功能。 【优化】重命名一些方法名称大小写。 【新增】首页设计轮播图增加高度设置功能。#I4SWEA 【修复】优化在苹果6/7/8plus及安卓一些机型出现分享海报弹窗文字被遮挡的问题。#I4SWCA
This commit is contained in:
JianWeie
@@ -10,14 +10,19 @@
|
||||
|
||||
|
||||
using System;
|
||||
using System.Collections.Generic;
|
||||
using System.Threading.Tasks;
|
||||
using CoreCms.Net.Caching.AccressToken;
|
||||
using CoreCms.Net.Configuration;
|
||||
using CoreCms.Net.IServices;
|
||||
using CoreCms.Net.Loging;
|
||||
using CoreCms.Net.Model.Entities;
|
||||
using CoreCms.Net.WeChat.Service.HttpClients;
|
||||
using InitQ.Abstractions;
|
||||
using InitQ.Attributes;
|
||||
using Newtonsoft.Json;
|
||||
using SKIT.FlurlHttpClient.Wechat.Api;
|
||||
using SKIT.FlurlHttpClient.Wechat.Api.Models;
|
||||
|
||||
namespace CoreCms.Net.RedisMQ.Subscribe
|
||||
{
|
||||
@@ -29,23 +34,22 @@ namespace CoreCms.Net.RedisMQ.Subscribe
|
||||
private readonly string _wxOpenAppId = AppSettingsConstVars.WxOpenAppId;
|
||||
private readonly string _wxOpenAppSecret = AppSettingsConstVars.WxOpenAppSecret;
|
||||
|
||||
private readonly ICoreCmsUserWeChatInfoServices _userWeChatInfoServices;
|
||||
private readonly ICoreCmsBillDeliveryServices _billDeliveryServices;
|
||||
private readonly ICoreCmsOrderServices _orderServices;
|
||||
private readonly ICoreCmsOrderItemServices _orderItemServices;
|
||||
private readonly ICoreCmsUserWeChatInfoServices _weChatInfoServices;
|
||||
private readonly IWeChatTransactionComponentOrderServices _tcOrderServices;
|
||||
private readonly WeChat.Service.HttpClients.IWeChatApiHttpClientFactory _weChatApiHttpClientFactory;
|
||||
private readonly ICoreCmsBillAftersalesServices _billAftersalesServices;
|
||||
private readonly ICoreCmsBillAftersalesItemServices _billAftersalesItemServices;
|
||||
|
||||
|
||||
|
||||
public TCOrderAfterSaleCreateSyncSubscribe(ICoreCmsUserWeChatInfoServices userWeChatInfoServices, ICoreCmsBillDeliveryServices billDeliveryServices, ICoreCmsOrderServices orderServices, ICoreCmsUserWeChatInfoServices weChatInfoServices, IWeChatTransactionComponentOrderServices tcOrderServices, ICoreCmsOrderItemServices orderItemServices)
|
||||
|
||||
public TCOrderAfterSaleCreateSyncSubscribe(ICoreCmsOrderServices orderServices, IWeChatTransactionComponentOrderServices tcOrderServices, IWeChatApiHttpClientFactory weChatApiHttpClientFactory, ICoreCmsBillAftersalesServices billAftersalesServices, ICoreCmsBillAftersalesItemServices billAftersalesItemServices)
|
||||
{
|
||||
_userWeChatInfoServices = userWeChatInfoServices;
|
||||
_billDeliveryServices = billDeliveryServices;
|
||||
_orderServices = orderServices;
|
||||
_weChatInfoServices = weChatInfoServices;
|
||||
_tcOrderServices = tcOrderServices;
|
||||
_orderItemServices = orderItemServices;
|
||||
_weChatApiHttpClientFactory = weChatApiHttpClientFactory;
|
||||
_billAftersalesServices = billAftersalesServices;
|
||||
_billAftersalesItemServices = billAftersalesItemServices;
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
@@ -75,33 +79,59 @@ namespace CoreCms.Net.RedisMQ.Subscribe
|
||||
return;
|
||||
}
|
||||
|
||||
////获取小程序认证
|
||||
//var accessToken = await new WeChatHelper().GetWxOpenAccessToken();
|
||||
////检查场景值是否在支付校验范围内
|
||||
////接口调用请求地址
|
||||
//var sceneUrl = WeChat.TransactionComponent.Api.Delivery.recieve(accessToken);
|
||||
//获取售后单
|
||||
var aftersale = await _billAftersalesServices.QueryByClauseAsync(p => p.aftersalesId == orderModel.billAftersalesId);
|
||||
//获取售后单详情
|
||||
var aftersaleItems = await _billAftersalesItemServices.QueryListByClauseAsync(p => p.aftersalesId == orderModel.billAftersalesId);
|
||||
|
||||
////组合请求
|
||||
//var sceneClient = new RestClient(sceneUrl);
|
||||
//var request = new RestRequest(RestSharp.Method.POST);
|
||||
//获取小程序认证
|
||||
var accessToken = WeChatCacheAccessTokenHelper.GetWxOpenAccessToken();
|
||||
var client = _weChatApiHttpClientFactory.CreateWxOpenClient();
|
||||
|
||||
//request.AddHeader("Content-Type", "application/json");
|
||||
//request.AddJsonBody(new
|
||||
//{
|
||||
// out_order_id = orderModel.orderId,
|
||||
// openid = tcOrderModel.openid,
|
||||
//});
|
||||
//var response = await sceneClient.ExecuteAsync(request);
|
||||
//var result = JsonConvert.DeserializeObject<CheckSceneResult>(response.Content);
|
||||
var request = new ShopAftersaleAddRequest();
|
||||
request.AccessToken = accessToken;
|
||||
request.OutOrderId = orderModel.orderId;
|
||||
request.OutAftersaleOrderId = orderModel.billAftersalesId;
|
||||
request.PagePath = "pages/member/afterSales/detail/detail?aftersalesId=" + orderModel.billAftersalesId;
|
||||
request.RefundFee = Convert.ToInt32(aftersale.refundAmount * 100);
|
||||
request.OpenId = tcOrderModel.openid;
|
||||
|
||||
//if (result != null && result.errcode == 0)
|
||||
//{
|
||||
// NLogUtil.WriteAll(NLog.LogLevel.Info, LogType.RedisMessageQueue, "自定义交易组件-同步创建售后单", JsonConvert.SerializeObject(result));
|
||||
//}
|
||||
//else
|
||||
//{
|
||||
// NLogUtil.WriteAll(NLog.LogLevel.Error, LogType.RedisMessageQueue, "自定义交易组件-同步创建售后单", JsonConvert.SerializeObject(result));
|
||||
//}
|
||||
if (aftersale.refundAmount > 0 && aftersale.type == (int)GlobalEnumVars.BillAftersalesIsReceive.Refund)
|
||||
{
|
||||
request.Type = (int)GlobalEnumVars.ShopAftersaleAddType.退款;
|
||||
}
|
||||
else if (aftersale.refundAmount > 0 && aftersale.type == (int)GlobalEnumVars.BillAftersalesIsReceive.Reship)
|
||||
{
|
||||
request.Type = (int)GlobalEnumVars.ShopAftersaleAddType.退款退货;
|
||||
|
||||
}
|
||||
else if (Convert.ToInt32(aftersale.refundAmount) == 0 && aftersale.type == (int)GlobalEnumVars.BillAftersalesIsReceive.Reship)
|
||||
{
|
||||
request.Type = (int)GlobalEnumVars.ShopAftersaleAddType.退款退货;
|
||||
}
|
||||
else if (Convert.ToInt32(aftersale.refundAmount) == 0 && aftersale.type == (int)GlobalEnumVars.BillAftersalesIsReceive.Refund)
|
||||
{
|
||||
request.Type = (int)GlobalEnumVars.ShopAftersaleAddType.退款;
|
||||
}
|
||||
|
||||
request.Status = 0;
|
||||
request.CreateTime = aftersale.createTime;
|
||||
request.IsFinishAll = false;
|
||||
|
||||
request.ProductList = new List<ShopAftersaleAddRequest.Types.Product>();
|
||||
aftersaleItems.ForEach(p =>
|
||||
{
|
||||
var product = new ShopAftersaleAddRequest.Types.Product();
|
||||
product.Count = p.nums;
|
||||
product.OutProductId = p.goodsId.ToString();
|
||||
product.OutSKUId = p.productId.ToString();
|
||||
request.ProductList.Add(product);
|
||||
});
|
||||
|
||||
var response = await client.ExecuteShopAftersaleAddAsync(request);
|
||||
|
||||
NLogUtil.WriteAll(response.IsSuccessful() ? NLog.LogLevel.Info : NLog.LogLevel.Error,
|
||||
LogType.RedisMessageQueue, "自定义交易组件-同步创建售后单", JsonConvert.SerializeObject(response));
|
||||
}
|
||||
else
|
||||
{
|
||||
@@ -115,7 +145,6 @@ namespace CoreCms.Net.RedisMQ.Subscribe
|
||||
{
|
||||
wxOpenAppId = _wxOpenAppId,
|
||||
wxOpenAppSecret = _wxOpenAppSecret,
|
||||
msg
|
||||
};
|
||||
NLogUtil.WriteAll(NLog.LogLevel.Error, LogType.RedisMessageQueue, "自定义交易组件-同步创建售后单", JsonConvert.SerializeObject(obj), ex);
|
||||
throw;
|
||||
|
||||
@@ -1,12 +1,12 @@
|
||||
/***********************************************************************
|
||||
* Project: CoreCms
|
||||
* ProjectName: 核心内容管理系统
|
||||
* Web: https://www.corecms.net
|
||||
* Author: 大灰灰
|
||||
* Email: jianweie@163.com
|
||||
* CreateTime: 2021/7/10 22:41:46
|
||||
* Description: 暂无
|
||||
***********************************************************************/
|
||||
* Project: CoreCms
|
||||
* ProjectName: 核心内容管理系统
|
||||
* Web: https://www.corecms.net
|
||||
* Author: 大灰灰
|
||||
* Email: jianweie@163.com
|
||||
* CreateTime: 2021/7/10 22:41:46
|
||||
* Description: 暂无
|
||||
***********************************************************************/
|
||||
|
||||
|
||||
using System;
|
||||
@@ -59,33 +59,26 @@ namespace CoreCms.Net.RedisMQ.Subscribe
|
||||
var accessToken = WeChatCacheAccessTokenHelper.GetWxOpenAccessToken();
|
||||
var client = _weChatApiHttpClientFactory.CreateWxOpenClient();
|
||||
|
||||
var sceneRequest = new ShopSceneCheckRequest();
|
||||
sceneRequest.AccessToken = accessToken;
|
||||
sceneRequest.Scene = orderModel.scene;
|
||||
|
||||
var sceneResponse = await client.ExecuteShopSceneCheckAsync(sceneRequest);
|
||||
if (sceneResponse.IsSuccessful() && sceneResponse.IsMatched == true)
|
||||
var userInfo = await _userWeChatInfoServices.QueryByClauseAsync(p => p.userId == orderModel.userId);
|
||||
if (userInfo != null)
|
||||
{
|
||||
var userInfo = await _userWeChatInfoServices.QueryByClauseAsync(p => p.userId == orderModel.userId);
|
||||
if (userInfo != null)
|
||||
{
|
||||
var payment = orderModel.paymentItem[0];
|
||||
var payment = orderModel.paymentItem[0];
|
||||
|
||||
//获取同步地址接口地址
|
||||
var request = new ShopOrderPayRequest();
|
||||
request.OutOrderId = orderModel.orderId;
|
||||
request.OpenId = userInfo.openid;
|
||||
request.ActionType = 1;
|
||||
request.TransactionId = payment.tradeNo;
|
||||
request.PayTime = payment.createTime;
|
||||
|
||||
var response = await client.ExecuteShopOrderPayAsync(request);
|
||||
}
|
||||
else
|
||||
{
|
||||
NLogUtil.WriteAll(NLog.LogLevel.Error, LogType.RedisMessageQueue, "自定义交易组件-同步订单状态", "微信用户数据获取失败");
|
||||
}
|
||||
//获取同步地址接口地址
|
||||
var request = new ShopOrderPayRequest();
|
||||
request.AccessToken = accessToken;
|
||||
request.OutOrderId = orderModel.orderId;
|
||||
request.OpenId = userInfo.openid;
|
||||
request.ActionType = 1;
|
||||
request.TransactionId = payment.tradeNo;
|
||||
request.PayTime = payment.createTime;
|
||||
|
||||
var response = await client.ExecuteShopOrderPayAsync(request);
|
||||
NLogUtil.WriteAll(NLog.LogLevel.Error, LogType.RedisMessageQueue, "自定义交易组件-同步订单状态", JsonConvert.SerializeObject(response));
|
||||
}
|
||||
else
|
||||
{
|
||||
NLogUtil.WriteAll(NLog.LogLevel.Error, LogType.RedisMessageQueue, "自定义交易组件-同步订单状态", "微信用户数据获取失败");
|
||||
}
|
||||
}
|
||||
else
|
||||
|
||||
Reference in New Issue
Block a user