Merge branch 'master-prod-new'

ANDRU-PC\Andru

2023-05-08 d288633938a13fe59901be5cf5946a4dfd420377

Merge branch 'master-prod-new'

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

@@ -25,11 +25,12 @@
    private String userInviteeName;
    /**所属咨询师*/
    private String userCorpUserName;
    /**所属门店*/
    private String userShopName;
    /**商品名称*/
    private String goodsName;

    /**订单所属门店*/
    private String shopId;
    /**客户所属门店*/
    private String userShopId;

    /*******保存参数********/
    /**操作人标识*/

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

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

import com.hx.resultTool.Result;
import com.hz.his.dto.user.money.PhisUserMoneyDto;
import com.hz.his.dto.user.money.UserMoneyDto;
import com.hz.his.dto.user.money.UserMoneyUpdateDto;
import org.springframework.cloud.openfeign.FeignClient;
import org.springframework.web.bind.annotation.PostMapping;
@@ -25,4 +26,10 @@
    @PostMapping(value = "/user/money/unclaimed/add")
    Result userMoneyUpdate(@RequestBody UserMoneyUpdateDto userMoneyUpdateDto);

    /**
     * 开放平台-用户资金信息
     */
    @PostMapping(value = "/user/money/info")
    Result userMoneyInfo(@RequestBody UserMoneyDto userMoneyDto);

}

 phis-feign/src/main/java/com/hz/his/vo/order/refund/RefundCancelVo.java

New file
@@ -0,0 +1,21 @@
package com.hz.his.vo.order.refund;

import lombok.Data;

/**
 * 作废退款实体结构
 * @author CJH
 */
@Data
public class RefundCancelVo {

    /**退款单标识-必填*/
    private String id;
    /**作废备注-必填*/
    private String remarks;
    /**操作员工-必填*/
    private String staffId;
    /**操作员工角色-必填*/
    private String staffRoleId;

}