|
@@ -584,23 +584,27 @@ namespace MySystem
|
|
|
}
|
|
|
|
|
|
function.WriteLog("订单号不存在,开始入库", "获取好哒FTP文件交易数据");
|
|
|
- decimal FeeRate = decimal.Parse(function.CheckNum(merchantAddInfo.FeeRate)) * 100;
|
|
|
- var query = db.ConsumerOrders.Add(new MpMainModels2.ConsumerOrders()
|
|
|
+ var query = db.ConsumerOrders.FirstOrDefault(m => m.OrderNo == OrderNo);
|
|
|
+ if(query == null)
|
|
|
{
|
|
|
- Status = 1,
|
|
|
- CreateDate = DateTime.Parse(TradeDate),
|
|
|
- UpdateDate = DateTime.Parse(TradeDate),
|
|
|
- SnNo = BaseNo,
|
|
|
- PayMoney = TradeAmount,
|
|
|
- PayMode = PayMode,
|
|
|
- SeoTitle = OrderNo,
|
|
|
- OrderNo = OrderNo,
|
|
|
- MerchantId = merchantAddInfo.Id,
|
|
|
- UserId = merchantInfo.UserId,
|
|
|
- SeoKeyword = merchantAddInfo.CybMakerCode,
|
|
|
- Sort = (int)FeeRate,
|
|
|
- TradePayNo = MerchantNo,
|
|
|
- }).Entity;
|
|
|
+ decimal FeeRate = decimal.Parse(function.CheckNum(merchantAddInfo.FeeRate)) * 100;
|
|
|
+ query = db.ConsumerOrders.Add(new MpMainModels2.ConsumerOrders()
|
|
|
+ {
|
|
|
+ Status = 1,
|
|
|
+ CreateDate = DateTime.Parse(TradeDate),
|
|
|
+ UpdateDate = DateTime.Parse(TradeDate),
|
|
|
+ SnNo = BaseNo,
|
|
|
+ PayMoney = TradeAmount,
|
|
|
+ PayMode = PayMode,
|
|
|
+ SeoTitle = OrderNo,
|
|
|
+ OrderNo = OrderNo,
|
|
|
+ MerchantId = merchantAddInfo.Id,
|
|
|
+ UserId = merchantInfo.UserId,
|
|
|
+ SeoKeyword = merchantAddInfo.CybMakerCode,
|
|
|
+ Sort = (int)FeeRate,
|
|
|
+ TradePayNo = MerchantNo,
|
|
|
+ }).Entity;
|
|
|
+ }
|
|
|
MpMainModels2.HdOrderTmp edit = db.HdOrderTmp.FirstOrDefault(m => m.OrderNo == OrderNo);
|
|
|
if(edit != null)
|
|
|
{
|