whm
/
djyweb_ams
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

1

Browse Source
master
wet 2 years ago
parent 63ac82c327
commit 2f1d2dd3db
2 changed files with 230 additions and 199 deletions
Show Stats Download Patch File Download Diff File

2
web/djy.Model/IsfDto/IsfInfo.cs
Unescape Escape View File

@ -110,7 +110,7 @@ namespace djy.Model.IsfDto
public class IsfInfo public class IsfInfo
{ {
public List<CompanyList> companyList { get; set; } public object companyList { get; set; }
public string format { get; set; } public string format { get; set; }

87
web/djy.Service/ISF/IsfService.cs
Unescape Escape View File

@ -267,8 +267,12 @@ namespace djy.Service.Isf
var fin = new FinanceService(); var fin = new FinanceService();
var master = DbBus.Get(DbList.AMSCenter).Select<ISF_Master>().Where(x => (x.IsDel == false || x.IsDel == null) && x.CompID == user.CompId && x.GID == oid).ToOne(); var master = DbBus.Get(DbList.AMSCenter).Select<ISF_Master>().Where(x => (x.IsDel == false || x.IsDel == null) && x.CompID == user.CompId && x.GID == oid).ToOne();
var comlist = DbBus.Get(DbList.AMSCenter).Select<ISF_Company>().Where(x => (x.IsDel == false || x.IsDel == null) && x.PID == oid).ToList(); var comlist = DbBus.Get(DbList.AMSCenter).Select<ISF_Company>().Where(x => (x.IsDel == false || x.IsDel == null) && x.PID == oid).ToList();
if (msgType != "3") if (msgType == "3")
{ {
req.Code = 201;
req.Message = "已删除单据不可以再次删除";
return req;
}
if (msgType == "4" && !(master.ReportState == "已删除" || master.MateState == "匹配失败")) if (msgType == "4" && !(master.ReportState == "已删除" || master.MateState == "匹配失败"))
{ {
@ -276,28 +280,28 @@ namespace djy.Service.Isf
req.Message = "当前状态不能重发！如有疑问，请联系相关客服！"; req.Message = "当前状态不能重发！如有疑问，请联系相关客服！";
return req; return req;
} }
if (msgType == "1" || msgType == "4") //if (msgType == "1" || msgType == "4")
{ //{
///扣费接口 // ///扣费接口
var getfinrs = fin.Expend(new CustFee // var getfinrs = fin.Expend(new CustFee
{ // {
SENDUSERID = user.GID, // SENDUSERID = user.GID,
LURURENID = user.GID, // LURURENID = user.GID,
CtnrCount = 1, // CtnrCount = 1,
CtnrInfo = string.Empty, // CtnrInfo = string.Empty,
BSTYPE = 16, // BSTYPE = 16,
SENDTYPE = 0, // SENDTYPE = 0,
BSNO = oid.ToString(), // BSNO = oid.ToString(),
MBLNO = master.MBLNO.ToString(), // MBLNO = master.MBLNO.ToString(),
} // }
, 0); // , 0);
if (!getfinrs.Status) // if (!getfinrs.Status)
{ // {
req.Code = 201; // req.Code = 201;
req.Message = getfinrs.Message; // req.Message = getfinrs.Message;
return req; // return req;
} // }
} //}
var portList = DbBus.Get(DbList.Common).Select<CodePort>().ToList(); var portList = DbBus.Get(DbList.Common).Select<CodePort>().ToList();
var CodePortLoadList = DbBus.Get(DbList.Common).Select<CodePortLoad>().ToList(); var CodePortLoadList = DbBus.Get(DbList.Common).Select<CodePortLoad>().ToList();
Info info = new Info(); Info info = new Info();
@ -307,12 +311,38 @@ namespace djy.Service.Isf
info.deliveryHarbourCode = portList.Where(x => x.Code == master.DeliveryHarbourCode).Select(x => x.EdiCode).FirstOrDefault(); info.deliveryHarbourCode = portList.Where(x => x.Code == master.DeliveryHarbourCode).Select(x => x.EdiCode).FirstOrDefault();
info.shipmentTypeCode = master.ShipmentTypeCode; info.shipmentTypeCode = master.ShipmentTypeCode;
info.hstCode = master.HstCode; info.hstCode = master.HstCode;
info.blTypeCode = master.BlTypeCode; info.blTypeCode = master.BlTypeCode;
info.refId = master.GID; info.refId = master.GID;
List<CompanyList> companyList = new List<CompanyList>(); List<CompanyList> companyList = new List<CompanyList>();
JArray arr = new JArray();
foreach (var item in comlist) foreach (var item in comlist)
{ {
JObject obj = new JObject();
if (!item.Address.IsNullOrEmpty())
obj.Add("address", new JValue($"{item.Address}"));
if (!item.City.IsNullOrEmpty())
obj.Add("city", new JValue($"{item.City}"));
if (!item.CompanyId.IsNullOrEmpty())
obj.Add("companyId", new JValue($"{item.CompanyId}"));
if (!item.CompanyName.IsNullOrEmpty())
obj.Add("companyName", new JValue($"{item.CompanyName}"));
if (!item.CompanyType.IsNullOrEmpty())
obj.Add("companyType", new JValue($"{item.CompanyType}"));
if (!item.CountryCode.IsNullOrEmpty())
obj.Add("countryCode", new JValue($"{item.CountryCode}"));
if (!item.HstCode.IsNullOrEmpty())
obj.Add("hstCode", new JValue($"{item.HstCode}"));
if (!item.IdTypeCode.IsNullOrEmpty())
obj.Add("idTypeCode", new JValue($"{item.IdTypeCode}"));
if (!item.PostCode.IsNullOrEmpty())
obj.Add("postCode", new JValue($"{item.PostCode}"));
if (!item.Province.IsNullOrEmpty())
obj.Add("province", new JValue($"{item.Province}"));
if (!item.ProvinceCode.IsNullOrEmpty())
obj.Add("provinceCode", new JValue($"{item.ProvinceCode}"));
arr.Add(obj);
companyList.Add(new CompanyList companyList.Add(new CompanyList
{ {
companyType = item.CompanyType, companyType = item.CompanyType,
@ -323,12 +353,13 @@ namespace djy.Service.Isf
city = item.City, city = item.City,
province = item.Province, province = item.Province,
provinceCode = item.ProvinceCode, provinceCode = item.ProvinceCode,
countryCode = item.ProvinceCode, countryCode = item.CountryCode,
postcode = item.PostCode, postcode = item.PostCode,
hstCode = item.HstCode, hstCode = item.HstCode,
}); });
} }
var timestamp = DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss"); var timestamp = DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss");
var AMSAccount = DbBus.Get(DbList.djydb).Select<ParamSet>().Where(x => x.PARAMNAME == "AMSAccount").ToOne(); var AMSAccount = DbBus.Get(DbList.djydb).Select<ParamSet>().Where(x => x.PARAMNAME == "AMSAccount").ToOne();
var method = DbBus.Get(DbList.djydb).Select<ParamSet>().Where(x => x.PARAMNAME == "ISFMethod").ToOne(); var method = DbBus.Get(DbList.djydb).Select<ParamSet>().Where(x => x.PARAMNAME == "ISFMethod").ToOne();
@ -336,12 +367,12 @@ namespace djy.Service.Isf
var url = DbBus.Get(DbList.djydb).Select<ParamSet>().Where(x => x.PARAMNAME == "AMSURL").ToOne(); var url = DbBus.Get(DbList.djydb).Select<ParamSet>().Where(x => x.PARAMNAME == "AMSURL").ToOne();
/////MD5加密 /////MD5加密
string stringSign = string.Format("companyList={0}&format=json&info={1}&method={2}&msgType={3}&timestamp={4}&user_id={5}&version=2.0&key={6}", string stringSign = string.Format("companyList={0}&format=json&info={1}&method={2}&msgType={3}&timestamp={4}&user_id={5}&version=2.0&key={6}",
JsonConvert.SerializeObject(companyList), JsonConvert.SerializeObject(info), method.PARAMVALUE, Convert.ToInt32(msgType), timestamp, AMSAccount.PARAMVALUE, key.PARAMVALUE); JsonConvert.SerializeObject(arr), JsonConvert.SerializeObject(info), method.PARAMVALUE, Convert.ToInt32(msgType), timestamp, AMSAccount.PARAMVALUE, key.PARAMVALUE);
string sign = stringSign.ToMd5().ToUpper(); string sign = stringSign.ToMd5().ToUpper();
///post参数 ///post参数
IsfInfo isfinfo = new IsfInfo(); IsfInfo isfinfo = new IsfInfo();
isfinfo.companyList = companyList; isfinfo.companyList = arr;
isfinfo.format = "json"; isfinfo.format = "json";
isfinfo.info = info; isfinfo.info = info;
isfinfo.method = method.PARAMVALUE; isfinfo.method = method.PARAMVALUE;
@ -475,7 +506,7 @@ namespace djy.Service.Isf
} }
} }
} }
}
} }
return req; return req;
} }

Write Preview
Loading…
Cancel
Save