Merge remote-tracking branch 'origin/master'

zhangxu

2022-10-11 07612f2a98dcd9c5c54d2b053987690fec010faa

Merge remote-tracking branch 'origin/master'

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

@@ -16,6 +16,9 @@
    /**分类标识*/
    private String typeId;

    //appid
    private String appId;


    public Integer getPageNum() {
        if(this.pageNum == null || this.pageNum < 0){
@@ -80,4 +83,12 @@
    public void setTypeId(String typeId) {
        this.typeId = typeId;
    }

    public String getAppId() {
        return appId;
    }

    public void setAppId(String appId) {
        this.appId = appId;
    }
}

 phis-feign/src/main/java/com/hz/his/dto/coupon/CouponGoodsDto.java

@@ -26,6 +26,10 @@
    private List<String> ids;
    /**商品类型*/
    private String goodsType;
    /*搜索参数*/
    private String keyWord;
    //使用类型
    private Integer useType;


    /**商品类型-项目*/

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

@@ -45,4 +45,6 @@
     */
    private String corpUserId;

    private String id;

}

 phis-feign/src/main/java/com/hz/his/dto/user/coupon/OrderUseGoodsDto.java

@@ -10,7 +10,7 @@
 */
@Data
public class OrderUseGoodsDto extends PageDto {
    /**CRM sku标识*/
    /**商品sku标识*/
    private String skuId;
    /**商品类型*/
    private Integer goodsType;

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

@@ -68,4 +68,16 @@
    Result checkGroupCoupon(@RequestBody CouponGoodsDto couponGoodsDto);


    /**
     * 根据优惠券id查询关联商品分类
     */
    @PostMapping(value = "/get/coupon/type")
    Result getCouponGoodsTyep(@RequestBody CouponGoodsDto couponGoodsDto);


    /**
     * 根据优惠券id统计关联商品
     */
    @PostMapping(value = "/get/coupon/goods")
    Result getCouponGoods(@RequestBody CouponGoodsDto couponGoodsDto);
}

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

New file
@@ -0,0 +1,23 @@
package com.hz.his.feign.service.phisAdmin;

import com.hx.resultTool.Result;
import org.springframework.cloud.openfeign.FeignClient;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestParam;

/**
 * 预约后台订单接口
 *
 * @Author: zhouxiang
 * @Date: 2022/09/27/15:59
 * @Description:
 */
@FeignClient(name="phis-service",contextId = "phis-order")
public interface SOrderService {
    /**
     * 查询订单详情接口
     * @return
     */
    @RequestMapping("/order/feign/get/one")
    Result getAllGoods(@RequestParam("orderId") String orderId);
}

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

@@ -91,5 +91,11 @@
    @PostMapping(value = "/order/refundNote/confirm")
    Result noteConfirm(@RequestBody OrderRefundNoteListDto orderRefundNoteListDto);

    /**
     * 开放平台-查询订单支付集合
     */
    @PostMapping(value = "/order/get/ConsumePay")
    Result getConsumePay(@RequestBody PayDto dto);


}

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

@@ -1,11 +1,9 @@
package com.hz.his.feign.service.platform;

import com.hx.resultTool.Result;
import com.hz.his.dto.card.CardQueryDto;
import org.springframework.cloud.openfeign.FeignClient;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestParam;

/**
 * 这里这个name 需要填写 请求的服务提供者的注册到nacos Server上面的服务名，path 是请求接口前缀
@@ -15,14 +13,16 @@

    /**
     * 开放平台-获取通知单详情
     * @param treatSingleId String类型JsonObject
     */
    @PostMapping(value = "/treat/confirmTreatNotice")
    Result getTreatInfo(@RequestParam("treatSingleId") String treatSingleId);
    @PostMapping(value = "/treat/info")
    Result getTreatInfo(@RequestBody String treatSingleId);

    /**
     * 开放平台-获取通知单确认
     * @param treatSingleId String类型JsonObject
     */
    @PostMapping(value = "/treat/confirmTreatNotice")
    Result confirmTreat(@RequestParam("treatSingleId") String treatSingleId);
    Result confirmTreat(@RequestBody String treatSingleId);

}