修正金屋每淘接口

fs-danaus

2022-09-22 407adf98fd303c0dd1c48f5102152abc52a49c62

修正金屋每淘接口

 WebRoot/js/encode.js

@@ -13,7 +13,7 @@
    numId=t;
    return ENCODE.encode(t).replaceAll("\\+","%2B").replaceAll("/","%2F");
}
function wOpen(formid,formidType,where){
function wOpen(formid,formidType,where,isClose){
    var tj=where.split(' and ');
    var info=null;
    where="";
@@ -26,7 +26,9 @@
        where+=info[0]+"="+info[1]+" and ";
    }
    where=where.substring(0,where.length-5);//up pengbei add
    $(".messager-body").window('close');
    if(isClose==undefined) {//默认是关闭当前弹窗 by danaus 2022/9/22 11:32
        $(".messager-body").window('close');
    }
    top.addTab("",formid,formidType,"wherePan="+where);
}
var toScrollFrame = function(iFrame, mask) {

 src/com/yc/open/meitao/MeiTaoService.java

@@ -99,8 +99,8 @@
        String PeriodID = mGridServiceIfc.getPeriodID(120222, head.companyID, head.docDate);
        sb.append(" declare @doccode1 varchar(50)\n")
                .append("  exec sp_newdoccode 120222,'SYSTEM',@doccode1 output \n")
                .append("insert into t120222h(docCode,formid,PeriodID,Docdate,doctype,EnterCode,EnterName,EnterDate,ModifyName,ModifyDate,DocStatus,companyID,companyName,[CltCode],[CltName],[ParentCltCode],[ParentCltName],[isBillingAccount],[PropertyAddress],[clttype],hDMemo,reduceMoney,cltdoccode,projectName,preSendDate,SellerCode,SellerName,ccCode,ccName,tel,tel2,hdcurrency,hdcurrencyrate,provinceName,cityName,districtName,oaid,payNo,ShippingMethod,ExpressCompany,isInsuredPrice,InsuredPrice,IsMoveFloor,IsXH,isDeliveryDoor,IsDB,IsReturn)values(@doccode1,120222,'" + PeriodID + "','" + docdate + "','正常定单','SYSTEM','管理员',getdate(),'管理员',getdate(),0," + GridUtils.prossSqlParm(head.companyID) + "," +GridUtils.prossSqlParm( head.companyName) + ",@cltCode," + GridUtils.prossSqlParm(t110203.cltName) + "," +GridUtils.prossSqlParm(t110203.parentCltCode) + "," +GridUtils.prossSqlParm( t110203.parentCltName) + "," + head.isBillingAccount + "," + GridUtils.prossSqlParm(t110203.propertyAddress) + ",'电商客户'," + GridUtils.prossSqlParm(head.hDMemo) + "," + head.reduceMoney + "," + GridUtils.prossSqlParm(head.cltdoccode) + "," +GridUtils.prossSqlParm (head.projectName) + "," + GridUtils.prossSqlParm(head.preSendDate) + "," + GridUtils.prossSqlParm(head.sellerCode) + "," +GridUtils.prossSqlParm( head.sellerName ) + ","+GridUtils.prossSqlParm(head.ccCode)+","+  GridUtils.prossSqlParm(head.ccName) + "," + GridUtils.prossSqlParm(t110203.tel) + "," + GridUtils.prossSqlParm(t110203.tel2 ) + ",'RMB',1,"+GridUtils.prossSqlParm(t110203.getProvinceName())+","+GridUtils.prossSqlParm(t110203.getCityName())+","+GridUtils.prossSqlParm(t110203.getDistrictName())+","+GridUtils.prossSqlParm(t110203.getOaid())+","+GridUtils.prossSqlParm(head.getPayNo())+","+GridUtils.prossSqlParm(head.getShippingMethod())+","+GridUtils.prossSqlParm(head.getExpressCompany())+","+head.getIsInsuredPrice()+","+GridUtils.prossSqlParm(head.getInsuredPrice())+","+head.getIsMoveFloor()+","+head.getIsXH()+","+head.getIsDeliveryDoor()+","+head.getIsDB()+","+head.getIsReturn()+")");
        return sb.toString();
                .append("insert into t120222h(docCode,formid,PeriodID,Docdate,doctype,EnterCode,EnterName,EnterDate,ModifyName,ModifyDate,DocStatus,companyID,companyName,[CltCode],[CltName],[ParentCltCode],[ParentCltName],[isBillingAccount],[PropertyAddress],[clttype],hDMemo,reduceMoney,cltdoccode,projectName,preSendDate,SellerCode,SellerName,ccCode,ccName,tel,tel2,hdcurrency,hdcurrencyrate,provinceName,cityName,districtName,oaid,payNo,ShippingMethod,ExpressCompany,isInsuredPrice,InsuredPrice,IsMoveFloor,IsXH,isDeliveryDoor,IsDB,IsReturn)values(@doccode1,120222,'" + PeriodID + "','" + docdate + "','正常定单','SYSTEM','管理员',getdate(),'管理员',getdate(),0," + GridUtils.prossSqlParm(head.companyID) + "," +GridUtils.prossSqlParm( head.companyName) + ",@cltCode," + GridUtils.prossSqlParm(t110203.cltName) + "," +GridUtils.prossSqlParm(t110203.parentCltCode) + "," +GridUtils.prossSqlParm( t110203.parentCltName) + "," + head.isBillingAccount + "," + GridUtils.prossSqlParm(t110203.propertyAddress) + ",'电商客户'," + GridUtils.prossSqlParm(head.hDMemo) + "," + head.reduceMoney + "," + GridUtils.prossSqlParm(head.cltdoccode) + "," +GridUtils.prossSqlParm (head.projectName) + "," + GridUtils.prossSqlParm(head.preSendDate) + "," + GridUtils.prossSqlParm(head.sellerCode) + "," +GridUtils.prossSqlParm( head.sellerName ) + ","+GridUtils.prossSqlParm(head.ccCode)+","+  GridUtils.prossSqlParm(head.ccName) + "," + GridUtils.prossSqlParm(t110203.tel) + "," + GridUtils.prossSqlParm(t110203.tel2 ) + ",'RMB',1,"+GridUtils.prossSqlParm(t110203.getProvinceName())+","+GridUtils.prossSqlParm(t110203.getCityName())+","+GridUtils.prossSqlParm(t110203.getDistrictName())+","+GridUtils.prossSqlParm(t110203.getOaid())+","+GridUtils.prossSqlParm(head.getPayNo())+","+GridUtils.prossSqlParm(head.getShippingMethod())+","+GridUtils.prossSqlParm(head.getExpressCompany())+","+head.getIsInsuredPrice()+","+head.getInsuredPrice()+","+head.getIsMoveFloor()+","+head.getIsXH()+","+head.getIsDeliveryDoor()+","+head.getIsDB()+","+head.getIsReturn()+")");
        return sb.toString();//
    }

    private Map get120222Detail(Sale sale) {

 src/com/yc/open/meitao/T120222Head.java

@@ -19,13 +19,13 @@
    String parentCltName;//项目名称
    String hDMemo;//注意事项
    String payNo;//网店交易号
    String shippingMethod;
    String expressCompany;
    String ShippingMethod;
    String ExpressCompany;
    Integer isInsuredPrice;
    String insuredPrice;
    Integer isMoveFloor;
    Integer isXH;
    Double InsuredPrice;
    Integer IsMoveFloor;
    Integer IsXH;
    Integer isDeliveryDoor;
    Integer isDB;
    Integer isReturn;
    Integer IsDB;
    Integer IsReturn;
}

 src/com/yc/open/mutual/controller/MutualController.java

@@ -1758,6 +1758,16 @@
                }
            }
        } else {
            /*if (!isfound && domain.indexOf(":9010") > 0) {//TODO 测试用
                for (String s : domainList) {
                    if (s.indexOf(":9010") > 0) {// 优先9001，&&s.startsWith("192.168.100.202")
                        //s = getProtocol(map, s);
                        url = "http://" + s;
                        isfound = true;
                        break;
                    }
                }
            }*/
            if (!isfound && domain.indexOf(":9001") > 0) {
                for (String s : domainList) {
                    if (s.indexOf(":9001") > 0) {// 优先9001，&&s.startsWith("192.168.100.202")