供应商pc后台结算管理 bugfix

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

@@ -84,13 +84,19 @@ public class SettlementVo {
     /**
      * (付款供应商)付款状态：1待付款、2部分付款、3已付款
      */
-    @ExcelProperty(value = "结算状态", index = 12)
+    @ExcelIgnore
     private Integer settleStatus;
+
+    @ExcelProperty(value = "结算状态", index = 12)
+    private String settleStatusStr;
     /**
      * 退款状态 1无退款、3有退款
      */
-    @ExcelProperty(value = "退款状态", index = 13)
+    @ExcelIgnore
     private Integer refundStatus;
+
+    @ExcelProperty(value = "退款状态", index = 13)
+    private String refundStatusStr;
     /**
      * 退款金额
      */

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

@@ -27,6 +27,7 @@ import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
 import com.google.common.util.concurrent.AtomicDouble;
 import lombok.extern.slf4j.Slf4j;
+import lombok.var;
 import org.apache.commons.codec.digest.DigestUtils;
 import org.apache.commons.lang.RandomStringUtils;
 import org.apache.commons.lang.StringUtils;
@@ -222,6 +223,10 @@ public class ShipServiceImpl implements ShipService {
             }
             settlement.setPaymentCommission(settlement.getPaymentCommission());
             settlement.setProrateCommission(settlement.getProrateCommission());
+            String refundStr = 1 == settlement.getRefundStatus() ? "无退款" : "有退款";
+            String settleStr = 1 == settlement.getSettleStatus() ? "未结算" : 2 == settlement.getSettleStatus() ? "部分结算" : "已结算";
+            settlement.setRefundStatusStr(refundStr);
+            settlement.setSettleStatusStr(settleStr);
         });
     }