Merge branch 'dev' of ssh://192.168.2.240:29418/kidgrow-microservices-platf...

zhaoxiaohao

2020-11-17 e9cbc4b86621cfdc2b7039e56fad760e80865389

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

@@ -1,6 +1,7 @@
package com.kidgrow.oprationcenter.controller;

import com.kidgrow.common.annotation.LoginUser;
import com.kidgrow.common.constant.CommonConstant;
import com.kidgrow.common.controller.BaseController;
import com.kidgrow.common.model.PageResult;
import com.kidgrow.common.model.ResultBody;
@@ -119,13 +120,14 @@
     */
    @ApiOperation(value = "套餐充值")
    @PostMapping("/saveTemp")
    public ResultBody saveProductDetail(Map<String,Object> params)
    public ResultBody saveProductDetail(@RequestBody Map<String,Object> params,@LoginUser SysUser sysUser)
    {
        if (StringUtils.isNotBlank(params.get("hospitalId").toString()) &&
                StringUtils.isNotBlank(params.get("departmentId").toString())&&
                        StringUtils.isNotBlank(params.get("hospitalName").toString())&&
                                StringUtils.isNotBlank(params.get("departmentName").toString())) {
            boolean isResult= productOrderService.saveProductDetail(params);
            params.put("proId", CommonConstant.REG_USER_PRODUCT_ID);
            boolean isResult= productOrderService.saveProductDetail(params,sysUser);
            if (isResult) {
                return ResultBody.ok().data(isResult).msg("试用套餐充值成功");
            }
@@ -190,4 +192,10 @@
        }
        return resultBody;
    }
    @ApiOperation(value = "获取用户套餐的使用状态")
    @PostMapping("/getStatus")
    public ResultBody getStatus(@RequestBody ProductOrder productOrder) {
        return productOrderService.getStatus(productOrder);
    }

}