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

fhx

2023-07-06 ab46861e9ba1b01506d94afea430e5d9fc8a80de

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

 phis-feign/src/main/java/com/hz/his/dto/card/CardBagDto.java

@@ -14,6 +14,8 @@
    private String userId;
    /**卡包标识*/
    private String cardBagId;
    /**卡包有效状态*/
    private Integer effectiveStatus;
    /**操作员工标识*/
    private String opEmployeeId;
    /**操作门店标识*/

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

@@ -26,11 +26,17 @@
    Result delayCardBag(@RequestBody CardBagDto cardBagDto);

    /**
     * 开放平台-卡包可抵扣信息
     * 开放平台-卡包可抵扣信息（单条）
     * @return 转化对象UserCardVo
     */
    @PostMapping(value = "/user/card/get/deduction-data")
    Result deductionData(@RequestBody CardBagDto cardBagDto);

    /**
     * 开放平台-卡包可抵扣信息（集合）
     * @return 转化对象userCardMapVo
     */
    @PostMapping(value = "/user/card/get/deduction-data/list")
    Result deductionDataList(@RequestBody CardBagDto cardBagDto);

}

 phis-feign/src/main/java/com/hz/his/vo/user/card/UserCardMapVo.java

New file
@@ -0,0 +1,15 @@
package com.hz.his.vo.user.card;

import lombok.Data;

import java.util.List;

/**用户卡项信息
 * @author CJH*/
@Data
public class UserCardMapVo {

    /**卡包数组*/
    private List<UserCardVo> userCardList;

}