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

wangrenhuang

2023-10-19 194fbb628f82b1bbf15a6c649fffcacf922f4391

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

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

@@ -42,6 +42,8 @@

    /**是否查询积分订单*/
    private Integer isIntegral;
    //是否查询已完成订单
    /**是否查询已完成订单*/
    private Integer isSuc;
    /**是否查询拼团 0 否 1 是*/
    private Integer isGroupBuy;
}

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

@@ -101,4 +101,6 @@
    private String treatSingleId;
    /** 创建方式（OrderTotalConstants） */
    private String addWay;
    /**是否拼团 0 否 1 是*/
    private Integer isGroupBuy;
}

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

New file
@@ -0,0 +1,29 @@
package com.hz.his.dto.report;
import java.util.List;

/***
 * 门店-咨询师 指标数据 dto
 */
public class ShopIndicatorsDto {

    //参数
    private List<String> shopIdList;
    private List<String> timeList;

    public List<String> getShopIdList() {
        return shopIdList;
    }

    public void setShopIdList(List<String> shopIdList) {
        this.shopIdList = shopIdList;
    }

    public List<String> getTimeList() {
        return timeList;
    }

    public void setTimeList(List<String> timeList) {
        this.timeList = timeList;
    }

}

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

@@ -30,6 +30,10 @@
    @PostMapping(value = "/market/activity/detail")
    Result detail(@RequestBody MarketActivityDto dto);

    /** 确认查看 */
    @PostMapping(value = "/market/activity/confirmView")
    Result confirmView(@RequestBody MarketActivityDto dto);

    /** 领取优惠券 */
    @PostMapping(value = "/market/activity/receiveCoupon")
    Result receiveCoupon(@RequestBody MarketActivityDto dto);

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

New file
@@ -0,0 +1,20 @@
package com.hz.his.feign.service.platform.bi;

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

/**
 * 咨询师评分报表
 * 这里这个name 需要填写 请求的服务提供者的注册到nacos Server上面的服务名，path 是请求接口前缀
 */
@FeignClient(name = "phiskin-bi-view-user", path = "/bi-view", contextId = "bi-shop-indicators")
public interface BiShopIndicatorsService {

    /*** 咨询师-评分列表 */
    @PostMapping("/admin/shop/indicators/list")
    Result shopEmpDeductionList(@RequestBody(required = false) ShopIndicatorsDto shopIndicatorsDto);

}