Merge branch 'master-zjw' into dev

xx-order/xx-order-server/src/main/java/com/xxfc/platform/order/biz/OrderAccountBiz.java

@@ -190,8 +190,10 @@ public class OrderAccountBiz extends BaseBiz<OrderAccountMapper,OrderAccount> {
      */
     public void refundSubProcess(BaseOrder baseOrder, String refundDesc, BigDecimal originalRefundAmount, BigDecimal refundAmount, Integer refundType, Integer refundStatus, OrderAccountDetail oad) {
         String refundTradeNo = null;
-        //0 小于 退款金额
-        if(BigDecimal.ZERO.compareTo(refundAmount) < 0) {
+        //退款金额 = 0 不退款，把refundTradeNo设置为 -1
+        if(BigDecimal.ZERO.compareTo(refundAmount) == 0) {
+            refundTradeNo = "-1";
+        }else if(BigDecimal.ZERO.compareTo(refundAmount) < 0) {
             OrderRefundVo orv = new OrderRefundVo();
             orv.setAmount(baseOrder.getRealAmount().multiply(new BigDecimal("100")).intValue());
             orv.setOrderNo(baseOrder.getNo());