|
@@ -6,7 +6,7 @@ using System.Threading;
|
|
|
using Library;
|
|
using Library;
|
|
|
using System.Net;
|
|
using System.Net;
|
|
|
using System.IO;
|
|
using System.IO;
|
|
|
-using MySystem.SpModels;
|
|
|
|
|
|
|
+using MySystem.MpMainModels2;
|
|
|
|
|
|
|
|
namespace MySystem
|
|
namespace MySystem
|
|
|
{
|
|
{
|
|
@@ -225,11 +225,11 @@ namespace MySystem
|
|
|
string through_date = DataListInfo[5]; //截止日期
|
|
string through_date = DataListInfo[5]; //截止日期
|
|
|
string channel_kind = DataListInfo[6]; //商户类型
|
|
string channel_kind = DataListInfo[6]; //商户类型
|
|
|
|
|
|
|
|
- MpMainModels2.HdBlueCircleTmp edit = db.HdBlueCircleTmp.FirstOrDefault(m => m.SnNo == sn_no);
|
|
|
|
|
|
|
+ HdBlueCircleTmp edit = db.HdBlueCircleTmp.FirstOrDefault(m => m.SnNo == sn_no);
|
|
|
if(edit == null)
|
|
if(edit == null)
|
|
|
{
|
|
{
|
|
|
function.WriteLog(DateTime.Now.ToString() + ":add:" + sn_no, "好哒小蓝环绑定");
|
|
function.WriteLog(DateTime.Now.ToString() + ":add:" + sn_no, "好哒小蓝环绑定");
|
|
|
- db.HdBlueCircleTmp.Add(new MpMainModels2.HdBlueCircleTmp()
|
|
|
|
|
|
|
+ db.HdBlueCircleTmp.Add(new HdBlueCircleTmp()
|
|
|
{
|
|
{
|
|
|
SnNo = sn_no,
|
|
SnNo = sn_no,
|
|
|
BindDate = bind_date,
|
|
BindDate = bind_date,
|
|
@@ -238,12 +238,20 @@ namespace MySystem
|
|
|
MchtNm = mcht_nm,
|
|
MchtNm = mcht_nm,
|
|
|
ThroughDate = through_date,
|
|
ThroughDate = through_date,
|
|
|
ChannelKind = channel_kind,
|
|
ChannelKind = channel_kind,
|
|
|
|
|
+ Status = 1
|
|
|
});
|
|
});
|
|
|
|
|
+
|
|
|
|
|
+ MerchantAddInfo merAdd = db.MerchantAddInfo.FirstOrDefault(m => m.MchtNo == mcht_no);
|
|
|
|
|
+ if(merAdd != null)
|
|
|
|
|
+ {
|
|
|
|
|
+ MerchantInfo mer = db.MerchantInfo.FirstOrDefault(m => m.Id == merAdd.Id && m.UserId > 0) ?? new MerchantInfo();
|
|
|
|
|
+ RedisDbconn.Instance.AddList("HaoDaPrizeDataQueue", "{\"brand_id\":29,\"ext_field\":\"xlh\",\"pos_sn\":\"" + sn_no + "\",\"user_id\":" + mer.UserId + "}");
|
|
|
|
|
+ }
|
|
|
}
|
|
}
|
|
|
else
|
|
else
|
|
|
{
|
|
{
|
|
|
function.WriteLog(DateTime.Now.ToString() + ":update:" + sn_no, "好哒小蓝环绑定");
|
|
function.WriteLog(DateTime.Now.ToString() + ":update:" + sn_no, "好哒小蓝环绑定");
|
|
|
- edit.Status = 0;
|
|
|
|
|
|
|
+ edit.Status += 1;
|
|
|
edit.BindDate = bind_date;
|
|
edit.BindDate = bind_date;
|
|
|
edit.BindDateDetail = bind_date_detail;
|
|
edit.BindDateDetail = bind_date_detail;
|
|
|
edit.MchtNo = mcht_no;
|
|
edit.MchtNo = mcht_no;
|