Merge branch 'master' into master-test

wangrenhuang

2023-05-22 a4d937e5e739d50b304a144da4c3317146b055d9

Merge branch 'master' into master-test

 phis-feign/src/main/java/com/hz/his/dto/coupon/CouponRecordDto.java

@@ -31,6 +31,8 @@
    public static String TYPE_COMMON_GIFT = "gift";
    /**公共标识类型,营销优惠券*/
    public static String TYPE_COMMON_MARKE = "marketing";
    //三八妇女节领取优惠券
    /**公共标识类型,三八妇女节领取优惠券*/
    public static final String TYPE_COMMON_QUEEN_DAY = "queen_day";
    /**公共标识类型,crm商品详情领取优惠券*/
    public static final String TYPE_COMMON_GOODS_DETAILS = "goods_details";
}

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

@@ -84,4 +84,8 @@
     */
    @PostMapping("/attention/product/record/edit")
    Result userAttentionProductRecordEdit(@RequestBody UserAttentionProductDto userAttentionProductDto);

    /*用户升级进度方法*/
    @PostMapping(value = "/user/level/progress")
    Result userLevelProgress(@RequestBody UserParamDto userParamDto);
}

 phis-feign/src/main/java/com/hz/his/feign/service/platform/bi/BiShopSaleService.java

@@ -77,6 +77,10 @@
    @PostMapping("/admin/export/shop/user/sleep/deduction/list")
    Result userSleepDeductionList(@RequestBody ShopReportDto shopReportDto);


    /**
     * 门店-医生执行占比情况
     */
    @PostMapping("/admin/export/shop/user/doctor/deduction/list")
    Result userDoctorDeductionList(@RequestBody ShopReportDto shopReportDto);

}