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

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

@@ -41,7 +41,7 @@ public class PayEndpoint extends EnvelopRestEndpoint {
    private BusinessOrderDao businessOrderDao;
    @GetMapping(value = "wxWapPay")
    @PostMapping(value = "wxWapPay")
    @ApiOperation(value = "微信wap支付")
    public ObjEnvelop wxWapPay(
            @ApiParam(name = "relationId", value = "业务id,如生活照料id 上面辅导id")
@@ -57,7 +57,7 @@ public class PayEndpoint extends EnvelopRestEndpoint {
        }
    }
    @GetMapping(value = "wxRefund")
    @PostMapping(value = "wxRefund")
    @ApiOperation(value = "微信发起退款")
    public ObjEnvelop wxRefund(
            @ApiParam(name = "relationId", value = "业务id,如生活照料id 上面辅导id")
@@ -73,7 +73,7 @@ public class PayEndpoint extends EnvelopRestEndpoint {
        }
    }
    @GetMapping(value = "wxNativePay")
    @PostMapping(value = "wxNativePay")
    @ApiOperation(value = "微信native支付")
    public ObjEnvelop wxNativePay(
            @ApiParam(name = "relationId", value = "业务id,如生活照料id 上面辅导id")

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

@@ -79,6 +79,8 @@ public class PayService {
    private LifeCareOrderService lifeCareOrderService;
    @Autowired
    private PatientDoorCoachOrderService doorCoachOrderService;
    @Value("${fastDFS.fastdfs_file_url}")
    private String fastdfs_file_url;
    /**
     * 微信退款
@@ -247,7 +249,7 @@ public class PayService {
            } catch (Exception e) {
                e.printStackTrace();
            }
            return ObjEnvelop.getSuccess("下单成功",serverUrl+fileUrl);
            return ObjEnvelop.getSuccess("下单成功",fastdfs_file_url+fileUrl);
        } else {
            return ObjEnvelop.getError(map.get("return_msg"),-1);
        }

svr/svr-cloud-care/src/main/resources/application.yml

@@ -422,7 +422,7 @@ spring:
    port: 6379  # Redis server port.
    password: Kb6wKDQP1W4
fastDFS:
  fastdfs_file_url: http://10.18.43.40:8888/
  fastdfs_file_url: https://zhyzh.hzxc.gov.cn/fastdfs/
fast-dfs:
  tracker-server: 10.18.43.40:22122 #服务器地址
# 短信验证码发送的客户端标识,居民端