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

jeepay-core/src/main/java/com/jeequan/jeepay/core/exception/BizExceptionResolver.java

@@ -21,6 +21,7 @@ import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.dao.DataAccessException;
+import org.springframework.http.MediaType;
 import org.springframework.web.servlet.HandlerExceptionResolver;
 import org.springframework.web.servlet.ModelAndView;
 
@@ -80,7 +81,8 @@ public class BizExceptionResolver implements HandlerExceptionResolver {
 
 
 	public void outPutJson(HttpServletResponse res, String jsonStr) throws IOException {
-		res.setContentType("text/json;charset=utf-8");
+
+		res.setContentType(MediaType.APPLICATION_JSON_UTF8_VALUE);
 		res.getWriter().write(jsonStr);
 		res.getWriter().flush();
 		res.getWriter().close();

jeepay-payment/src/main/java/com/jeequan/jeepay/pay/ctrl/payorder/AbstractPayOrderController.java

@@ -171,6 +171,10 @@ public abstract class AbstractPayOrderController extends ApiController {
                 payOrder = genPayOrder(bizRQ, mchInfo, mchApp, ifCode, mchPayPassage);
             }else{
                 payOrder.setIfCode(ifCode);
+
+                // 查询支付方式的费率，并 在更新ing时更新费率信息
+                payOrder.setMchFeeRate(mchPayPassage.getRate());
+                payOrder.setMchFeeAmount(AmountUtil.calPercentageFee(payOrder.getAmount(), payOrder.getMchFeeRate())); //商户手续费,单位分
             }
 
             //预先校验