1.走查运营后台后,修改了页面所有显著错误和问题 2.修改运营后台 医院,充值,产品,套餐部分业务错误 3.增加首页数据接口

houruijun

2020-08-07 c45ba41f54c6424a20198617ff4df7433bf9e9a9

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

@@ -16,6 +16,7 @@
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.collections4.MapUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.validation.BindingResult;
import org.springframework.validation.ObjectError;
import org.springframework.web.bind.annotation.*;
@@ -99,6 +100,8 @@
            if(organizations.size()>0){
                productOrder.setCreateUserOrgCode(organizations.get(organizations.size()-1).getOrgCode());
            }
            //默认添加的合同视为无效合同,在充值完成后,会将对应合同启用
            productOrder.setIsDel(true);
            boolean v = productOrderService.saveOrUpdate(productOrder);
            if (v) {
                return ResultBody.ok().data(productOrder).msg("保存成功");
@@ -113,11 +116,18 @@
     */
    @ApiOperation(value = "删除")
    @DeleteMapping("/{id}")
    @Transactional(rollbackFor = {Exception.class})
    public ResultBody delete(@PathVariable Long id,HttpServletRequest request) {
        //先删除合同下的充值
        int delRows= productOrderService.delProductDetail(id);
        if (delRows==0) {
            log.info(String.format("该订单下无套餐数据{0}！",id));
        }
        //再删除合同
        boolean v = productOrderService.removeById(id);
        if (v) {
            if (!businessRecordsService.recordBusinessData("删除合同:"+id,id.toString())) {
                //log.error(String.format("删除合同编号为:{0}的数据后,写入业务日志失败！",id));
                log.error(String.format("删除合同编号为:{0}的数据后,写入业务日志失败！",id));

            }
            return ResultBody.ok().msg("删除成功");
@@ -147,7 +157,7 @@
        if (resultBody.getCode()==0) {
            String enablad=(MapUtils.getBoolean(params, "enabled"))?"启用":"禁用";
            if (!businessRecordsService.recordBusinessData("修改合同状态为:"+enablad,enablad)) {
                //log.error(String.format("修改合同状态为:{0},写入业务日志失败！合同管理id为：{1}",enablad,MapUtils.getString(params,"id")));
                log.error(String.format("修改合同状态为:{0},写入业务日志失败！合同管理id为：{1}",enablad,MapUtils.getString(params,"id")));
            }
        }
        return resultBody;