供应商pc后台结算管理 bugfix

src/main/java/com/caimei365/order/model/vo/SettlementVo.java

@@ -34,67 +34,67 @@ public class SettlementVo {
     /**
      * 协销名称
      */
-    @ExcelProperty(value = "销售名称", index = 3)
+    @ExcelIgnore
     private String spName;
 
-    @ExcelProperty(value = "服务商名称", index = 4)
+    @ExcelProperty(value = "服务商名称", index = 3)
     private String cpName;
     /**
      * 供应商结算成本
      */
-    @ExcelProperty(value = "供应商结算金额", index = 5)
+    @ExcelProperty(value = "供应商结算金额", index = 4)
     private Double shopSettleAmount;
     /**
      * 采美结算佣金
      */
-    @ExcelProperty(value = "采美结算金额", index = 6)
+    @ExcelProperty(value = "采美结算金额", index = 5)
     private Double cmSettleAmount;
     /**
      * 服务商结算佣金
      */
-    @ExcelProperty(value = "服务商结算金额", index = 7)
+    @ExcelProperty(value = "服务商结算金额", index = 6)
     private Double otherSettleAmount;
     /**
      * 商品信息
      */
-    @ExcelProperty(value = "商品信息", index = 8)
+    @ExcelProperty(value = "商品信息", index = 7)
     private String productInfo;
 
     /**
      * 子订单可能包含多个商品，当前展示为总数量
      * （锦波业务一般下单商品）
      */
-    @ExcelProperty(value = "商品总数量", index = 9)
+    @ExcelProperty(value = "商品总数量", index = 8)
     private Integer productNum;
     /**
      * 订单金额
      */
-    @ExcelProperty(value = "订单金额", index = 10)
+    @ExcelProperty(value = "订单金额", index = 9)
     private Double totalAmount;
     /**
      * 支付手续费
      */
-    @ExcelProperty(value = "支付手续费", index = 11)
+    @ExcelProperty(value = "支付手续费", index = 10)
     private Double paymentCommission;
     /**
      * 分帐手续费
      */
-    @ExcelProperty(value = "分帐手续费", index = 12)
+    @ExcelProperty(value = "分帐手续费", index = 11)
     private Double prorateCommission;
     /**
      * (付款供应商)付款状态：1待付款、2部分付款、3已付款
      */
-    @ExcelProperty(value = "结算状态", index = 13)
+    @ExcelProperty(value = "结算状态", index = 12)
     private Integer settleStatus;
     /**
      * 退款状态 1无退款、3有退款
      */
-    @ExcelProperty(value = "退款状态", index = 14)
+    @ExcelProperty(value = "退款状态", index = 13)
     private Integer refundStatus;
     /**
      * 退款金额
      */
-    @ExcelProperty(value = "退款金额", index = 15)
+    @ExcelProperty(value = "退款金额", index = 14)
     private Double refundAmount;
     /**
      * 订单商品信息

src/main/java/com/caimei365/order/service/impl/ShipServiceImpl.java

@@ -208,8 +208,8 @@ public class ShipServiceImpl implements ShipService {
             // 分帐记录
             Double splitAccount = shipMapper.getSplitAccount(settlement.getShopOrderId());
             // 分帐手续费
-            Double splitCommission = MathUtil.mul(splitAccount, 0.001).doubleValue();
-            splitCommission = splitCommission <= 0 ? 0.01 : splitCommission;
+            Double splitCommission = MathUtil.mul(splitAccount, 0.001, 2).doubleValue();
+            splitCommission = splitCommission < 0.01 ? 0.01 : splitCommission;
             settlement.setProrateCommission(splitCommission);
             // 总退款金额
             settlement.setRefundAmount(refund.get());