fhx
2024-02-05 74527e7ce6ab1a5e09d3d4936e5157188e983e49
Merge branch 'master-prod-new' into master-test
4个文件已修改
32 ■■■■■ 已修改文件
phis-feign/src/main/java/com/hz/his/dto/coupon/CouponListDto.java 2 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
phis-feign/src/main/java/com/hz/his/dto/coupon/CouponRecordDto.java 2 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
phis-feign/src/main/java/com/hz/his/feign/service/phis/SUserService.java 7 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
phis-feign/src/main/java/com/hz/his/feign/service/platform/bi/BiShopSPAService.java 21 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
phis-feign/src/main/java/com/hz/his/dto/coupon/CouponListDto.java
@@ -33,6 +33,8 @@
    private List<String> orderIdList;
    /** 订单标识 */
    private String orderId;
    /** 标志标识 */
    private String commonId;
    /**要结账操作平台APPID*/
    private String appId;
phis-feign/src/main/java/com/hz/his/dto/coupon/CouponRecordDto.java
@@ -41,4 +41,6 @@
    public static final String TYPE_COMMON_ORDER = "order";
    /**公共标识类型,抽奖活动*/
    public static final String TYPE_COMMON_DRAW = "draw";
    /**公共标识类型,ken活动领取 */
    public static String TYPE_COMMON_ACTIVITY_KEN = "activity_ken";
}
phis-feign/src/main/java/com/hz/his/feign/service/phis/SUserService.java
@@ -384,4 +384,11 @@
    @PostMapping(value = "/user/merge/log")
    Result userMergeLog(@RequestBody UserDto userDto);
    /**
     * 查询用户VIP记录以及要领取的优惠券,传userId字段
     * */
    @PostMapping(value = "/user/vip/log/coupon")
    Result userVipLogCoupon(@RequestBody UserDto userDto);
}
phis-feign/src/main/java/com/hz/his/feign/service/platform/bi/BiShopSPAService.java
@@ -2,6 +2,7 @@
import com.hx.resultTool.Result;
import com.hz.his.dto.report.EmployeeReportDto;
import com.hz.his.dto.report.PerformanceReqParamsDto;
import com.hz.his.dto.report.ShopReportDto;
import org.springframework.cloud.openfeign.FeignClient;
import org.springframework.web.bind.annotation.PostMapping;
@@ -36,4 +37,24 @@
     */
    @PostMapping("/admin/export/shop/spa/project/indicators/list")
    Result projectIndicatorsList(@RequestBody ShopReportDto shopReportDto);
    /**
     * SPA门店月执行数据
     */
    @RequestMapping("admin/export/shop/spa/month/deduction/new")
    Result monthDeductionNew(@RequestBody ShopReportDto shopReportDto);
    /**
     * SPA门店-员工月执行数据
     */
    @RequestMapping("admin/export/shop/spa/month/deduction/emp/new")
    Result monthDeductionEmpNew(@RequestBody ShopReportDto shopReportDto);
    /**
     * SPA门店-员工月执行明细导出
     */
    @RequestMapping("admin/export/shop/spa/month/deduction/emp/new/report")
    Result monthDeductionEmpExport(@RequestBody PerformanceReqParamsDto performanceReqParamsDto);
}