Merge remote-tracking branch 'origin/master-test' into master-test

fhx

2024-05-31 c73425451381d5338de8a47253bae007eddc7c8f

Merge remote-tracking branch 'origin/master-test' into master-test

 phis-feign/src/main/java/com/hz/his/feign/service/phis/SCouponService.java

@@ -162,6 +162,10 @@
    @PostMapping(value = "/coupon/birthday/list/user")
    Result userBirthDayCouponList(@RequestBody(required = false) CouponDto dto);


    /**
     * 获取优惠券领取规则列表
     */
    @PostMapping(value = "/coupon/receive/rule/list")
    Result getReceiveRuleList();

}

 phis-feign/src/main/java/com/hz/his/vo/coupon/CouponReceiveVo.java

New file
@@ -0,0 +1,15 @@
package com.hz.his.vo.coupon;

import lombok.Data;

/**
 *  优惠券领取规则
 * */
@Data
public class CouponReceiveVo {
    /**规则标识*/
    private String id;
    /**规则名称*/
    private String name;

}

 phis-feign/src/main/java/com/hz/phis/vo/returnVisitRecord/ReturnVisitListItemVo.java

@@ -59,21 +59,5 @@
    public ReturnVisitListItemVo() {
    }

    public ReturnVisitListItemVo(Map<String,Object> visitRecord) {
        this.id = visitRecord.get("id").toString();
        this.timeoutStatus = MapUtil.getInt(visitRecord,"timeoutStatus");
        this.returnVisitStatus = MapUtil.getInt(visitRecord,"returnVisitStatus");
        this.shopId = MapUtil.getString(visitRecord,"shopId");
        this.shopName = MapUtil.getString(visitRecord,"shopName");
        this.returnVisitType =  MapUtil.getString(visitRecord,"returnVisitType");
        this.returnVisitTypeName =  MapUtil.getString(visitRecord,"returnVisitTypeName");
        this.visitResultStatus =  MapUtil.getInt(visitRecord,"visitResultStatus");
        this.satisfiedStatus =  MapUtil.getInt(visitRecord,"satisfiedStatus");
        this.corpName =  MapUtil.getString(visitRecord,"corpName");
        this.corpId =  MapUtil.getString(visitRecord,"corpId");;
        this.content =  MapUtil.getString(visitRecord,"content");
        this.remark =  MapUtil.getString(visitRecord,"remark");
        this.createPersonName =  MapUtil.getString(visitRecord,"createPersonName");;
    }
}


 phis-feign/src/main/java/com/hz/phis/vo/returnVisitRecord/ReturnVisitListVo.java

@@ -38,6 +38,8 @@
    private String memberNO;
    /**手机号*/
    private String tel;
    /**用户外部联系人编号*/
    private String externalUserId;

    /**渠道来源*/
    private String channelType;