Merge branch 'dev' of http://192.168.2.240:7070/r/kidgrow-microservices-pla...

houruijun

2020-07-21 77dbb85286de0ec52d8144bb7c89483c2909a07e

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

@@ -7,9 +7,12 @@
import com.kidgrow.common.model.SysOrganization;
import com.kidgrow.common.model.SysUser;
import com.kidgrow.oprationcenter.model.ProductOrderDetail;
import com.kidgrow.oprationcenter.model.ProductOrderRecord;
import com.kidgrow.oprationcenter.service.IBusinessRecordsService;
import com.kidgrow.oprationcenter.service.IProductOrderDetailService;
import com.kidgrow.oprationcenter.service.IProductOrderRecordService;
import com.kidgrow.oprationcenter.service.IProductOrderService;
import com.kidgrow.oprationcenter.vo.ProductOrderJoinDetail;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiImplicitParam;
import io.swagger.annotations.ApiImplicitParams;
@@ -24,9 +27,7 @@

import javax.servlet.http.HttpServletRequest;
import javax.validation.Valid;
import java.util.ArrayList;
import java.util.List;
import java.util.Map;
import java.util.*;


/**
@@ -45,6 +46,8 @@
public class ProductOrderDetailController extends BaseController {
    @Autowired
    private IProductOrderDetailService productOrderDetailService;
    @Autowired
    private IProductOrderRecordService productOrderRecordService;
    @Autowired
    private IBusinessRecordsService businessRecordsService;
    @Autowired
@@ -66,7 +69,6 @@
        }
        return productOrderDetailService.findList(params);
    }

    /**
     * 列表
     */
@@ -75,13 +77,31 @@
            @ApiImplicitParam(name = "page", value = "分页起始位置", required = true, dataType = "Integer"),
            @ApiImplicitParam(name = "limit", value = "分页结束位置", required = true, dataType = "Integer")
    })
    @GetMapping("/all")
    public PageResult findAllList(@RequestParam Map<String, Object> params,@LoginUser SysUser sysUser) {
    @GetMapping("all")
    public PageResult all(@RequestParam Map<String, Object> params) {
        if (params.size() == 0) {
            params.put("page", 1);
            params.put("limit", 10);
        }
        return productOrderDetailService.findAllList(params,sysUser);
        return productOrderDetailService.all(params);
    }
    /**
     * 列表
     */
    @ApiOperation(value = "查询列表")
    @ApiImplicitParams({
            @ApiImplicitParam(name = "page", value = "分页起始位置", required = true, dataType = "Integer"),
            @ApiImplicitParam(name = "limit", value = "分页结束位置", required = true, dataType = "Integer")
    })
    @PostMapping("/alldata")
    public PageResult findAllDataList(@RequestParam Map<String, Object> params) {
        if (params.size() == 0) {
            params.put("page", 1);
            params.put("limit", 10);
        }
        if(params.get("diagnosticHospitalId")==null)
            return PageResult.<ProductOrderJoinDetail>builder().data(null).code(0).count(0L).build();
        return productOrderDetailService.findAllDataList(params);
    }

    /**
@@ -99,6 +119,21 @@
            params.put("limit", 10);
        }
        return productOrderDetailService.groupList(params);
    }

    /**
     * 获取医院套餐是否到期和到期时间
     * data内 isend为true说明套餐到期
     * endtime上套餐的到期时间
     * @param hospitalId
     * @param departmentId
     * @return
     */

    @ApiOperation(value = "获取医院套餐是否到期和到期时间")
    @GetMapping("/UserProductDetailData")
    public ResultBody UserProductDetailData(@RequestParam Long hospitalId,Long departmentId) {
        return productOrderDetailService.UserProductDetailData(hospitalId,departmentId);
    }

    /**
@@ -161,8 +196,28 @@
            }
            return ResultBody.failed().msg(errMsg.toString());
        } else {
            //写充值套餐给用户
            Boolean v = productOrderDetailService.saveBatch(list);
            if (v) {
            //写充值记录
            //对象转换
            List<ProductOrderRecord> productOrderRecordList= new ArrayList<ProductOrderRecord>();;
            list.forEach(item->{
                ProductOrderRecord productOrderRecord=new ProductOrderRecord();
                productOrderRecord.setAilightCount(item.getAilightCount());
                productOrderRecord.setOrderId(item.getOrderId());
                productOrderRecord.setProId(item.getProId());
                productOrderRecord.setProName(item.getProName());
                productOrderRecord.setProType(item.getProType());
                productOrderRecord.setIsShare(item.getIsShare());
                productOrderRecord.setIsDel(item.getIsDel());
                productOrderRecord.setRecordCount(item.getRecordCount());
                productOrderRecord.setProBegintime(item.getProBegintime());
                productOrderRecord.setProEndtime(item.getProEndtime());
                productOrderRecord.setEnabled(item.getEnabled());
                productOrderRecordList.add(productOrderRecord);
            });
            Boolean r = productOrderRecordService.saveBatch(productOrderRecordList);
            if (v&&r) {
                return ResultBody.ok().data(list.size()).msg("产品充值成功");
            } else {
                //写入订单明细失败，则删除订单记录数据
@@ -218,4 +273,15 @@
        }
        return resultBody;
    }

    /**
     * 获取 用户的状态  为试用状态还是 启用状态
     *
     * @return
     */
    @ApiOperation(value = "获取 用户的状态")
    @GetMapping("/getTypeByUser")
    public ResultBody getTypeByUser(@LoginUser SysUser sysUser) {
        return productOrderDetailService.getTypeByUser(sysUser);
    }
}