|
@@ -134,6 +134,21 @@ public class OrderUtils {
|
|
|
Double shouldSettleOrganize = 0d;
|
|
|
|
|
|
if (onlineFlag.get()) {
|
|
|
+ /** 减0.1%分账手续费
|
|
|
+ * 最低手续费 0.01,计算金额与原金额相等时 - 0.01
|
|
|
+ */
|
|
|
+ Double splitCmFee = MathUtil.div(cmFee, 1.001, 2).doubleValue();
|
|
|
+ if (cmFee.equals(splitCmFee)) {
|
|
|
+ cmFee = cmFee - 0.01;
|
|
|
+ } else {
|
|
|
+ cmFee = splitCmFee;
|
|
|
+ }
|
|
|
+ Double splitShop = MathUtil.div(v, 1.001, 2).doubleValue();
|
|
|
+ if (v.equals(splitShop)) {
|
|
|
+ v = v - 0.01;
|
|
|
+ } else {
|
|
|
+ v = splitShop;
|
|
|
+ }
|
|
|
// 线上已付采美
|
|
|
paidCm = payShopDao.findOnlinePayCm(shopOrder.getShopOrderId(), 3);
|
|
|
// 线上已付供应商
|
|
@@ -149,10 +164,6 @@ public class OrderUtils {
|
|
|
waitSettleCm = MathUtil.sub(cmFee, settleCm).doubleValue();
|
|
|
settleOrganize = payShopDao.findSettleSum(shopOrder.getShopOrderId(), 3);
|
|
|
waitSettleOrganize = MathUtil.sub(organizeFee.get(), settleOrganize).doubleValue();
|
|
|
- // 减0.1%分账手续费
|
|
|
-
|
|
|
- cmFee = MathUtil.div(cmFee, 1.001, 2).doubleValue();
|
|
|
- v = MathUtil.div(v, 1.001, 2).doubleValue();
|
|
|
|
|
|
shouldSettleShop = v;
|
|
|
shouldSettleCm = cmFee;
|