Merge branch 'dev' of http://192.168.1.220:10080/Amoy2/wlyy2.0 into dev

# Conflicts:
#	svr/svr-cloud-care/src/main/java/com/yihu/jw/care/service/doorCoach/PatientDoorCoachOrderService.java
#	svr/svr-cloud-care/src/main/java/com/yihu/jw/care/service/lifeCare/LifeCareOrderService.java

common/common-util/src/main/java/com/yihu/jw/util/common/IpUtil.java

@@ -55,6 +55,30 @@ public class IpUtil {
    }
    /**
     * 获取真实ip地址
     *
     * @param request
     * @return java.lang.String
     */
    public static String getOneIpAddress(HttpServletRequest request) {
        String ip = request.getHeader("x-forwarded-for");
        if (ip == null || ip.length() == 0 || "unknown".equalsIgnoreCase(ip)) {
            ip = request.getHeader("Proxy-Client-IP");
        }
        if (ip == null || ip.length() == 0 || "unknown".equalsIgnoreCase(ip)) {
            ip = request.getHeader("WL-Proxy-Client-IP");
        }
        if (ip == null || ip.length() == 0 || "unknown".equalsIgnoreCase(ip)) {
            ip = request.getRemoteAddr();
        }
        if (ip.contains(",")) {
            return ip.split(",")[0];
        } else {
            return ip;
        }
    }
    /**
     * 获取客户端请求中的真实的ip地址
     *  获取客户端的IP地址的方法是：request.getRemoteAddr()，这种方法在大部分情况下都是有效的。

svr/svr-cloud-care/src/main/java/com/yihu/jw/care/endpoint/patient/PayEndpoint.java

@@ -134,8 +134,11 @@ public class PayEndpoint extends EnvelopRestEndpoint {
            @ApiParam(name = "id", value = "订单id")
            @RequestParam(value = "id", required = true) Integer id) {
        try{
            payService.applyRefund(id, description, enclosure);
            return success("发起退款成功");
            String res = payService.applyRefund(id, description, enclosure);
            if(StringUtil.isBlank(res)){
                return success("申请退款成功");
            }
            return Envelop.getError(res,-1);
        }catch (Exception e){
            return failedObjEnvelopException2(e);
        }
@@ -144,7 +147,7 @@ public class PayEndpoint extends EnvelopRestEndpoint {
    @PostMapping(value = "wxNativePay")
    @ApiOperation(value = "微信native支付")
    public ObjEnvelop wxNativePay(
            @ApiParam(name = "relationId", value = "业务id,如生活照料id 上面辅导id")
            @ApiParam(name = "relationId", value = "业务id,如生活照料id 上门辅导id")
            @RequestParam(value = "relationId", required = false) String relationId,
            @ApiParam(name = "orderId", value = "订单id")
            @RequestParam(value = "orderId", required = false) Integer orderId,HttpServletRequest request) {

svr/svr-cloud-care/src/main/java/com/yihu/jw/care/service/pay/PayService.java

@@ -478,10 +478,13 @@ public class PayService {
        // 此路径是微信服务器调用支付结果通知路径
        reqMap.put("notify_url", serverUrl+"pay/open/wxPayNotify");
        reqMap.put("out_trade_no", businessOrderDO.getOrderNo());
        reqMap.put("spbill_create_ip", IpUtil.getIpAddr(request));
        reqMap.put("spbill_create_ip", IpUtil.getOneIpAddress(request));
        reqMap.put("product_id", businessOrderDO.getOrderNo());
        // 订单总金额，单位为分
        Double payAmountIntValue = businessOrderDO.getPayPrice() * 100;
        if(payAmountIntValue.intValue()<=0){
            return ObjEnvelop.getError("支付金额必须大于0",-1);
        }
        reqMap.put("total_fee", String.valueOf(payAmountIntValue.intValue()));
        reqMap.put("trade_type", "NATIVE");
        // 创建第一次签名
@@ -555,10 +558,13 @@ public class PayService {
        // 此路径是微信服务器调用支付结果通知路径
        reqMap.put("notify_url", serverUrl+"pay/open/wxPayNotify");
        reqMap.put("out_trade_no", businessOrderDO.getOrderNo());
        reqMap.put("spbill_create_ip", IpUtil.getIpAddr(request));
        reqMap.put("spbill_create_ip", IpUtil.getOneIpAddress(request));
        reqMap.put("product_id", businessOrderDO.getOrderNo());
        // 订单总金额，单位为分
        Double payAmountIntValue = businessOrderDO.getPayPrice() * 100;
        if(payAmountIntValue.intValue()<=0){
            return ObjEnvelop.getError("支付金额必须大于0",-1);
        }
        reqMap.put("total_fee", String.valueOf(payAmountIntValue.intValue()));
        reqMap.put("trade_type", "JSAPI");
        reqMap.put("openid", patientDO.getOpenid());