Merge branch 'master-prod-new' into master-prod-new-优惠券校验

fwq

2023-05-16 88ee15e7fa163d928525c71ca6504f23db751a57

Merge branch 'master-prod-new' into master-prod-new-优惠券校验

 phis-feign/src/main/java/com/hz/his/dto/report/EmployeeReportDto.java

@@ -26,4 +26,6 @@
    private String startTime;
    /**结束时间*/
    private String endTime;
    /**类型*/
    private Integer type;
}

 phis-feign/src/main/java/com/hz/his/dto/user/money/UserMoneyDto.java

@@ -12,6 +12,11 @@
@Data
@ToString
public class UserMoneyDto {

    /**当前页数*/
    private Integer pageNum;
    /**当前页显示条数*/
    private Integer pageSize;
    /**
     * 操作人类型
     */
@@ -28,7 +33,10 @@
     * 操作备注
     */
    private String remarks;

    /**
     * 类型(查询类型)
     */
    private Integer type;
    /**
     * 记录类型
     */
@@ -110,6 +118,8 @@
    /*是否需要领取 0 否 1 是  默认需要领取*/
    private Integer isReceiveValueAddedFund;

    /**是否领建资金记录 0 否 1 是*/
    private Integer isHisRecord;

    /*****************类型信息 注：以下常量以phis的UserMoneyLog常量为主*******************************/
    /**

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

@@ -1,5 +1,6 @@
package com.hz.his.feign.service.platform;

import com.alibaba.fastjson.JSONObject;
import com.hx.resultTool.Result;
import com.hz.his.dto.user.money.UserMoneyDto;
import org.springframework.cloud.openfeign.FeignClient;
@@ -49,4 +50,10 @@
     * */
    @PostMapping(value = "/user/money/unclaimed/default/setting")
    Result userDefaultSetting(@RequestBody UserMoneyDto userMoneyDto);

    /**
     * 用户资金使用记录列表
     * */
    @PostMapping(value = "/user/money/use/log/list")
    Result useLogListData(@RequestBody UserMoneyDto userMoneyDto);
}

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

@@ -3,6 +3,7 @@
import com.hx.resultTool.Result;
import com.hz.his.dto.aduit.AduitDto;
import com.hz.his.dto.order.*;
import com.hz.his.vo.order.refund.RefundCancelVo;
import org.springframework.cloud.openfeign.FeignClient;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody;
@@ -164,4 +165,12 @@
     */
    @PostMapping(value = "/order/init/order-money")
    Result initOrderMoney(@RequestBody OrderInitVo orderInitVo);

    /**
     * 开放平台-作废退款
     * data 实体转化用 无
     */
    @PostMapping(value = "/order/refund/cancel")
    Result refundCancel(@RequestBody RefundCancelVo refundCancelVo);

}

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

@@ -1,6 +1,7 @@
package com.hz.his.feign.service.platform.bi;

import com.hx.resultTool.Result;
import com.hz.his.dto.report.EmployeeReportDto;
import com.hz.his.dto.report.ShopReportDto;
import org.springframework.cloud.openfeign.FeignClient;
import org.springframework.web.bind.annotation.PostMapping;
@@ -49,4 +50,10 @@
    @PostMapping("/admin/export/shop/other/list")
    Result otherInAchievement(@RequestBody ShopReportDto shopReportDto);

    /**
     * 门店-员工-用户执行业绩
     */
    @PostMapping("/admin/user/deduction/report/shop/emp/list")
    Result shopEmpUserList(@RequestBody EmployeeReportDto employeeReportDto);

}

 phis-feign/src/main/java/com/hz/phis/dt/user/UserDt.java

@@ -1,5 +1,7 @@
package com.hz.phis.dt.user;

import com.gitee.sunchenbin.mybatis.actable.annotation.Column;
import com.gitee.sunchenbin.mybatis.actable.constants.MySqlTypeConstant;
import lombok.Data;

import java.math.BigDecimal;
@@ -71,5 +73,9 @@
    private String imgUrl;
    private String hisId;
    private String userBelongingType;
     //电网咨询顾问(TMK) (Employee id)
    private String internetCorpUserId;
    //所属护士
    private String nurseCorpUserId;

}