Merge remote-tracking branch 'origin/master-prod-new' into master-prod-new-...

fwq

2023-03-21 ed330ac8093d93cba9fd25fc32267039e8909e83

Merge remote-tracking branch 'origin/master-prod-new' into master-prod-new-合并账号

 phis-feign/src/main/java/com/hz/his/dto/user/project/DirectCannelVo.java

@@ -11,10 +11,12 @@
    private Integer operateType;
    /**操作疗程数*/
    private Integer operateNum;
    /**操作划扣金额*/
    private Integer deductionTotal;

    /**操作门店标识*/
    /**操作门店标识（废弃）*/
    private String shopId;
    /**操作员工*/
    /**操作员工（废弃）*/
    private String employeeId;
    /**操作员工角色*/
    private String employeeRoleId;

 phis-feign/src/main/java/com/hz/his/dto/user/project/DirectRepealVo.java

New file
@@ -0,0 +1,22 @@
package com.hz.his.dto.user.project;

import lombok.Data;

@Data
public class DirectRepealVo {

    /**操作用户项目记录标识*/
    private String id;

    /**操作门店标识（废弃）*/
    private String shopId;
    /**操作员工（废弃）*/
    private String employeeId;
    /**操作员工角色*/
    private String employeeRoleId;

    /**操作原因*/
    private String remarkInfo;


}

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

@@ -2,6 +2,7 @@

import com.hx.resultTool.Result;
import com.hz.his.dto.user.project.DirectCannelVo;
import com.hz.his.dto.user.project.DirectRepealVo;
import org.springframework.cloud.openfeign.FeignClient;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody;
@@ -18,6 +19,15 @@
     * @param directCannelVo 封装对象
     * @return
     */
    @PostMapping(value = "/user/getUserLabel")
    @PostMapping(value = "/user/project/direct/cancel")
    Result directCancel(@RequestBody DirectCannelVo directCannelVo);

    /**
     * 作废直接操作用户项目
     * 员工直接操作
     * @param directRepealVo 封装对象
     * @return
     */
    @PostMapping(value = "/user/project/direct/repeal")
    Result directRepeal(@RequestBody DirectRepealVo directRepealVo);
}