修正受托代销时，小程序对账明细显示不完整的问题

johnswang

2021-11-30 52ff0310786286c547c94968f78d6bfb61abaaa1

修正受托代销时，小程序对账明细显示不完整的问题

 src/com/yc/sdk/shopping/action/Order.java

@@ -148,6 +148,7 @@
        SimpleDateFormat sdf2 = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss") ;
        SimpleDateFormat sdf3 = new SimpleDateFormat("yyyy-MM-dd HH:mm") ;
        DecimalFormat df = new DecimalFormat("0.00");
        //DecimalFormat df2 = new DecimalFormat("0");
        try {
            DataSourceEntity dataSourceEntity = MultiDataSource.getDataSourceMap( request) ;
            SpObserver.setDBtoInstance("_"+dataSourceEntity.getDbId());//切换数据源
@@ -316,7 +317,13 @@
                    }
                    
                    if (settingEntity.isShowPrice()) {
                        orderDetailEntityJsonObject.addProperty("Price", orderDetailEntity.getPrice() ); // 实际价格
//                        int price = new Double(orderDetailEntity.getPrice()).intValue();
//                        if (price == orderDetailEntity.getPrice()) {
//                            orderDetailEntityJsonObject.addProperty("Price",df2.format(orderDetailEntity.getPrice())); // 实际价格
//                        }else {
//                            orderDetailEntityJsonObject.addProperty("Price",df.format(orderDetailEntity.getPrice())); // 实际价格
//                        }
                        orderDetailEntityJsonObject.addProperty("Price",orderDetailEntity.getPrice()); // 不含税价格
                        orderDetailEntityJsonObject.addProperty("Currency", currencyEntity.getCurrency());
                        orderDetailEntityJsonObject.addProperty("CurrencySign", currencyEntity.getCurrencySign());
                    }
@@ -498,6 +505,7 @@
        //boolean isMoblieBrowser = SettingKey.isMoblieBrowser(request);
        String hostUrl = SettingKey.getHostUrl(request) ;  
        DecimalFormat df = new DecimalFormat("0.00");
        //DecimalFormat df2 = new DecimalFormat("0");
        
        JsonObject json = new JsonObject();
        JsonObject errJson = new JsonObject();
@@ -683,7 +691,13 @@
                }
                
                if (settingEntity.isShowPrice()) {
                    orderDetailEntityJsonObject.addProperty("Price", orderDetailEntity.getPrice() ); // 实际价格
//                    int price = new Double(orderDetailEntity.getPrice()).intValue();
//                    if (price == orderDetailEntity.getPrice()) {
//                        orderDetailEntityJsonObject.addProperty("Price",df2.format(orderDetailEntity.getPrice())); // 实际价格
//                    }else {
//                        orderDetailEntityJsonObject.addProperty("Price",df.format(orderDetailEntity.getPrice())); // 实际价格
//                    }
                    orderDetailEntityJsonObject.addProperty("Price",orderDetailEntity.getPrice()); // 实际价格
                    orderDetailEntityJsonObject.addProperty("Currency", currencyEntity.getCurrency());
                    orderDetailEntityJsonObject.addProperty("CurrencySign", currencyEntity.getCurrencySign());
                }

 src/com/yc/sdk/shopping/service/balance/BalanceImpl.java

@@ -156,7 +156,21 @@
                + " begin \n"
                + "     select top 1 @CompanyId = CompanyId from oCompany \n"
                + " end \n"
                + " insert into @table(DocCode,FormId,FormName,InsertTime,BalanceAmount,AmountDebit,AmountCredit,SubCltName) \n"
                + " select a.DocCode,a.FormId,b.FormName,a.InsertTime,\n"
                + "        sum(isnull(a.AmountDebit,0) - isnull(a.AmountCredit,0)) as BalanceAmount,  --借方减贷方 \n"
                + "        sum(isnull(a.AmountDebit,0)) as AmountDebit,\n"
                + "        sum(isnull(a.AmountCredit,0)) as AmountCredit, \n"
                + "        '' as SubCltName \n"
                + "    from t150102 a  \n"
                + "    join gform b on a.FormId = b.FormId \n"
                + "    where a.CompanyId = @CompanyId and a.AcctCode = @AccountsReceivableAcctCode   \n"
                + "    and a.Currency = @Currency and a.cv1 = @CltCode --and a.formid not in (120230,120406) \n"
                + "    group by a.DocCode,a.FormId,b.FormName,a.InsertTime \n"
                + "    having sum(isnull(a.AmountDebit,0) - isnull(a.AmountCredit,0)) <> 0.0 \n"
                
				
                /*
                + " insert into @table(DocCode,FormId,FormName,InsertTime,BalanceAmount,AmountDebit,AmountCredit,SubCltName) \n"
                + " select a.DocCode,a.FormId,b.FormName,a.InsertTime, \n"
                + "   sum(isnull(a.AmountDebit,0) - isnull(a.AmountCredit,0)) as BalanceAmount,  --借方减贷方   \n"
@@ -197,6 +211,7 @@
                + " and a.Currency = @Currency and a.CltCode = @CltCode and a.formid = 120406 \n"
                + " group by a.DocCode,a.FormId,b.FormName \n"
                + " having sum(isnull(a.AmountDebit,0) - isnull(a.AmountCredit,0)) <> 0.0 \n"
                */
                
                + " update a set InsertTime = case when b.PostDate is null then b.ModifyDate else b.PostDate end \n"
                + " from @table a join t120406H b on a.doccode = b.doccode  \n"

 src/com/yc/sdk/shopping/util/Test.java

@@ -3,13 +3,20 @@
public class Test {

    public static void main(String[] args) {
	
        double a = 1000.0001;
        int b = new Double(a).intValue();
        if (b == a) {
            System.out.println("ok") ;
        }else {
            System.out.println("not ok");
        }
        
        System.out.println(StringReplaceUtil.getStarString2("张三四",1,0)) ;
        System.out.println(StringReplaceUtil.getStarString2("13827778996",3,4)) ;
        String address = "常州天宁区弘阳广场五栋甲单元2号";
        System.out.println(StringReplaceUtil.getStarString(address,10,address.length()-1)) ;
        System.out.println(StringReplaceUtil.getStarString2(address,address.length() - 10,0)) ;
		
//        System.out.println(StringReplaceUtil.getStarString2("张三四",1,0)) ;
//        System.out.println(StringReplaceUtil.getStarString2("13827778996",3,4)) ;
//        String address = "常州天宁区弘阳广场五栋甲单元2号";
//        System.out.println(StringReplaceUtil.getStarString(address,10,address.length()-1)) ;
//        System.out.println(StringReplaceUtil.getStarString2(address,address.length() - 10,0)) ;

    }