Merge remote-tracking branch 'origin/developerF' into developerF

src/main/java/com/caimei/modules/bulkpurchase/web/CmRefundsProductController.java

@@ -475,7 +475,7 @@ public class CmRefundsProductController extends BaseController {
                 return fee;
             } else if (newOrder.getReceiptStatus().equals("2")) {//部分收款(全退部分收款的金额)--运费可以选择退或不退
                 Double freight = newOrder.getFreight();/** 默认不退*/
-                if (freightNum > 0) {/**退运费*/
+                if (freightNum >= 0) {/**退运费*/
                     freight = 0d;
                 }
                 //获取部分支付金额