套餐过期修改

bingbing

2020-07-23 ae71e461c11c2dfc45d500255ccaf67c3ec201e5

套餐过期修改

 kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-api/src/main/java/com/kidgrow/oprationcenter/feign/ConsumptionService.java

@@ -5,6 +5,7 @@
import com.kidgrow.oprationcenter.feign.fallback.ConsumptionServiceFallbackFactory;
import com.kidgrow.oprationcenter.model.HospitalInfo;
import com.kidgrow.oprationcenter.vo.ConsumptionRequest;
import com.kidgrow.oprationcenter.vo.UserProductData;
import com.kidgrow.ribbon.config.FeignHttpInterceptorConfig;
import org.springframework.cloud.openfeign.FeignClient;
import org.springframework.web.bind.annotation.GetMapping;
@@ -51,8 +52,8 @@
     * @param departmentId
     */
    @GetMapping(value = "productorderdetail/UserProductDetailData")
    ResultBody UserProductDetailData (@RequestParam("hospitalId") Long hospitalId, @RequestParam("departmentId")  Long departmentId);
    ResultBody<UserProductData> UserProductDetailData (@RequestParam("hospitalId") Long hospitalId, @RequestParam("departmentId")  Long departmentId);

    @PostMapping("/productorderdetail/serviceperiod")
    ResultBody ServicePeriod(@RequestBody HospitalInfo hospitalInfo);
    ResultBody<UserProductData> ServicePeriod(@RequestBody HospitalInfo hospitalInfo);
}

 kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-biz/src/main/java/com/kidgrow/oprationcenter/service/IProductOrderDetailService.java

@@ -5,10 +5,7 @@
import com.kidgrow.common.model.SysUser;
import com.kidgrow.common.service.ISuperService;
import com.kidgrow.oprationcenter.model.ProductOrderDetail;
import com.kidgrow.oprationcenter.vo.DiagnosisRecord;
import com.kidgrow.oprationcenter.vo.GroupProductDetail;
import com.kidgrow.oprationcenter.vo.ProductOrderJoinDetail;
import com.kidgrow.oprationcenter.vo.UserProductDetail;
import com.kidgrow.oprationcenter.vo.*;

import java.util.List;
import java.util.Map;
@@ -71,7 +68,7 @@
    UserProductDetail getUserProductDetail(Long hospitalId, Long departmentId);

    ResultBody biUserNowProduct(Long hospitalId,Long departmentId);
    ResultBody UserProductDetailData(Long hospitalId,Long departmentId);
    ResultBody<UserProductData> UserProductDetailData(Long hospitalId, Long departmentId);

    PageResult all(Map<String, Object> params);
}

 kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-biz/src/main/java/com/kidgrow/oprationcenter/service/impl/ProductOrderDetailServiceImpl.java

@@ -9,7 +9,6 @@
import com.kidgrow.oprationcenter.feign.DiagnosticService;
import com.kidgrow.oprationcenter.mapper.ConsumptionRecordMapper;
import com.kidgrow.oprationcenter.mapper.ProductOrderDetailMapper;
import com.kidgrow.oprationcenter.mapper.ProductOrderMapper;
import com.kidgrow.oprationcenter.model.ConsumptionRecord;
import com.kidgrow.oprationcenter.model.ProductOrder;
import com.kidgrow.oprationcenter.model.ProductOrderDetail;
@@ -76,7 +75,7 @@
     * @param departmentId
     * @return
     */
    public ResultBody UserProductDetailData(Long hospitalId,Long departmentId)
    public ResultBody<UserProductData> UserProductDetailData(Long hospitalId,Long departmentId)
    {
        UserProductData userProductData=new UserProductData();
        userProductData.setEnd(true);

 kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-server/src/main/java/com/kidgrow/oprationcenter/controller/ProductOrderDetailController.java

@@ -14,6 +14,7 @@
import com.kidgrow.oprationcenter.service.IProductOrderRecordService;
import com.kidgrow.oprationcenter.service.IProductOrderService;
import com.kidgrow.oprationcenter.vo.ProductOrderJoinDetail;
import com.kidgrow.oprationcenter.vo.UserProductData;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiImplicitParam;
import io.swagger.annotations.ApiImplicitParams;
@@ -148,7 +149,7 @@

    @ApiOperation(value = "获取医院套餐是否到期和到期时间")
    @PostMapping("/serviceperiod")
    public ResultBody ServicePeriod(@RequestBody HospitalInfo hospitalInfo) {
    public ResultBody<UserProductData> ServicePeriod(@RequestBody HospitalInfo hospitalInfo) {
        return productOrderDetailService.UserProductDetailData(hospitalInfo.getHospitalId(),hospitalInfo.getDepartmentId());
    }