Authored by chaogeng

Merge branch 'union_1101' of http://git.yoho.cn/yoho30/yohobuy-union into union_1101

... ... @@ -72,12 +72,12 @@ public class PanshiServiceImpl implements IOrderPushService {
if (goods.size() == 1) {
OrdersGood good = goods.get(0);
param.put("proNo", good.getProductSkn());
param.put("proPrice", good.getRealPayFee());
param.put("proPrice", good.getLastPrice().setScale(2, BigDecimal.ROUND_HALF_UP).doubleValue());
param.put("proNum", good.getBuyNumber());
param.put("proName", good.getProductName());
param.put("proCat", good.getSortName());
param.put("commRate", COMMRATE);
orMoney = good.getRealPayFee().multiply(new BigDecimal(good.getBuyNumber())).setScale(2, BigDecimal.ROUND_HALF_UP);
orMoney = good.getRealPayFee().setScale(2, BigDecimal.ROUND_HALF_UP);
} else {
StringBuffer skns = new StringBuffer();
StringBuffer prices = new StringBuffer();
... ... @@ -87,12 +87,12 @@ public class PanshiServiceImpl implements IOrderPushService {
StringBuffer rates = new StringBuffer();
for (int i = 0; i < goods.size(); i++) {
skns.append(goods.get(i).getProductSkn() + "|");
prices.append(goods.get(i).getRealPayFee().setScale(2, BigDecimal.ROUND_HALF_UP) + "|");
prices.append(goods.get(i).getLastPrice().setScale(2, BigDecimal.ROUND_HALF_UP).doubleValue() + "|");
nums.append(goods.get(i).getBuyNumber() + "|");
names.append(goods.get(i).getProductName() + "|");
cats.append(goods.get(i).getSortName() + "|");
rates.append(COMMRATE + "|");
orMoney = orMoney.add(goods.get(i).getRealPayFee().multiply(new BigDecimal(goods.get(i).getBuyNumber()))).setScale(2, BigDecimal.ROUND_HALF_UP);
orMoney = orMoney.add(goods.get(i).getRealPayFee()).setScale(2, BigDecimal.ROUND_HALF_UP);
}
param.put("proNo", skns.substring(0, skns.length() - 1));
param.put("proPrice", prices.substring(0, prices.length() - 1));
... ...