|
|
@@ -43,17 +43,8 @@ namespace MySystem.Controllers
|
|
|
return View();
|
|
|
}
|
|
|
|
|
|
- public string setFee(string merNo, string sn, decimal fee)
|
|
|
+ public string setFee(string merNo, string sn, decimal fee, int addRate = 0)
|
|
|
{
|
|
|
- int addRate = 0;
|
|
|
- if(fee == 0.63M)
|
|
|
- {
|
|
|
- addRate = 300;
|
|
|
- }
|
|
|
- else if(fee == 0.6M)
|
|
|
- {
|
|
|
- fee = 0.63M;
|
|
|
- }
|
|
|
string content = PublicImportDataService.Instance.SetFee(merNo, sn, fee, addRate);
|
|
|
JsonData obj = JsonMapper.ToObject(content);
|
|
|
if (obj["code"].ToString() == "000000")
|