Merge remote-tracking branch 'origin/master'

doum

17 小时以前 8fd09daba5c89106b4a9aacd8d5ef9354afc93be

 server/dmmall_service/src/main/java/com/doumee/core/wx/WxMiniUtilService.java

@@ -46,8 +46,8 @@
            request.setOutRefundNo(refNum);
           // request.setTotalFee(2);
          //  request.setRefundFee(1);
            request.setTotalFee(BaseWxPayRequest.yuanToFen(totalPrice.toString()));
            request.setRefundFee(BaseWxPayRequest.yuanToFen(refundPrice.toString()));
            request.setTotalFee(1);//BaseWxPayRequest.yuanToFen(totalPrice.toString()));
            request.setRefundFee(1);//BaseWxPayRequest.yuanToFen(refundPrice.toString()));
            WxPayRefundResult response = WxMiniConfig.wxPayService.refund(request);
            if ("SUCCESS".equals(response.getReturnCode()) && "SUCCESS".equals(response.getResultCode())) {
                return refNum;