Merge remote-tracking branch 'origin/dev' into dev

zhaoxiaohao

2020-04-24 d3386ce4a4439ee740ca79d33ac7040963a18948

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

@@ -6,6 +6,7 @@
import com.kidgrow.oprationcenter.model.ProductOrderDetail;
import com.kidgrow.oprationcenter.service.IBusinessRecordsService;
import com.kidgrow.oprationcenter.service.IProductOrderDetailService;
import com.kidgrow.oprationcenter.service.IProductOrderService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiImplicitParam;
import io.swagger.annotations.ApiImplicitParams;
@@ -13,6 +14,7 @@
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.collections.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.*;
@@ -26,6 +28,7 @@

/**
 * 石家庄喜高科技有限责任公司 版权所有 © Copyright 2020<br>
 *
 * @Description: 产品/明显的充值记录
 * @Project: 运营中心
 * @CreateDate: Created in 2020-04-02 18:25:34 <br>
@@ -41,6 +44,8 @@
    private IProductOrderDetailService productOrderDetailService;
    @Autowired
    private IBusinessRecordsService businessRecordsService;
    @Autowired
    private IProductOrderService productOrderService;

    /**
     * 列表
@@ -129,9 +134,36 @@
            boolean v= productOrderDetailService.saveOrUpdate(productOrderDetail);
            if(v) {
                return ResultBody.ok().data(productOrderDetail).msg("保存成功");
            }
            else {
            } else {
                return ResultBody.failed().msg("保存失败");
            }
        }
    }

    /**
     * 新增or更新
     */
    @ApiOperation(value = "保存")
    @PostMapping("/saveall")
    @Transactional(rollbackFor = Exception.class)
    public ResultBody batchInsert(@Valid @RequestBody List<ProductOrderDetail> list, BindingResult bindingResult) {
        List<String> errMsg = new ArrayList<>();
        if (bindingResult.hasErrors()) {
            for (ObjectError error : bindingResult.getAllErrors()) {
                errMsg.add(error.getDefaultMessage());
            }
            return ResultBody.failed().msg(errMsg.toString());
        } else {
            Boolean v = productOrderDetailService.saveBatch(list);
            if (v) {
                return ResultBody.ok().data(list.size()).msg("产品充值成功");
            } else {
                //写入订单明细失败，则删除订单记录数据
                Boolean e = productOrderService.removeById(list.get(0).getOrderId());
                if (e)
                    return ResultBody.failed().msg("充值数据保存失败，订单已撤回！");
                else
                    return ResultBody.failed().msg("充值数据保存失败，订单撤回失败！");
            }
        }
    }
@@ -148,11 +180,11 @@
                //log.error(String.format("删除订单明细id为：{1}",id));
            }
            return ResultBody.ok().msg("删除成功");
        }
        else {
        } else {
            return ResultBody.failed().msg("删除失败");
        }
    }

    /**
     * 修改状态
     *