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/service/pay/PayService.java

@@ -470,13 +470,15 @@ public class PayService {
     */
    @Transactional(rollbackFor = Exception.class)
    public void refundNotify(BusinessOrderRefundDO orderDO) {
        log.error("【支付通知】请求，payWater：{}", orderDO);
        log.error("【退款通知】请求，getOrderNo：{}", orderDO.getOrderNo());
        String type = "";
        //防止重复支付
        if (orderDO.getStatus()!=1) {
            log.error("【退款通知】请求，getStatus：{}", orderDO.getStatus());
            return;
        }
        BusinessOrderDO businessOrderDO = businessOrderDao.selectByOrderNo(orderDO.getOrderNo());
        type = businessOrderDO.getOrderCategory();
        switch (type){
            case "1":
                //desc = "招生报名";
@@ -495,8 +497,12 @@ public class PayService {
            default:
                break;
        }
        orderDO.setStatus(2);
        orderDO.setRefundTime(new Date());
        businessOrderDO.setStatus(4);
        orderRefundDao.save(orderDO);
        businessOrderDao.save(businessOrderDO);
        log.info("【退款通知】成功，type：{}", type);
    }