From a8bf44754f50d0b0a65f0f2d4beefc131261e35d Mon Sep 17 00:00:00 2001
From: zhaoxiaohao <913652501@qq.com>
Date: Wed, 24 Jun 2020 16:53:47 +0800
Subject: [PATCH] Merge branch 'dev' of http://192.168.2.240:7070/r/kidgrow-microservices-platform into dev
---
kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-server/src/main/java/com/kidgrow/oprationcenter/controller/ProductOrderDetailController.java | 82 ++++++++++++++++++++++++++++++-----------
1 files changed, 60 insertions(+), 22 deletions(-)
diff --git a/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-server/src/main/java/com/kidgrow/oprationcenter/controller/ProductOrderDetailController.java b/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-server/src/main/java/com/kidgrow/oprationcenter/controller/ProductOrderDetailController.java
index 7325ba4..71355b5 100644
--- a/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-server/src/main/java/com/kidgrow/oprationcenter/controller/ProductOrderDetailController.java
+++ b/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-server/src/main/java/com/kidgrow/oprationcenter/controller/ProductOrderDetailController.java
@@ -1,12 +1,18 @@
package com.kidgrow.oprationcenter.controller;
+import com.kidgrow.common.annotation.LoginUser;
import com.kidgrow.common.controller.BaseController;
import com.kidgrow.common.model.PageResult;
import com.kidgrow.common.model.ResultBody;
+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;
@@ -21,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.*;
/**
@@ -42,6 +46,8 @@
public class ProductOrderDetailController extends BaseController {
@Autowired
private IProductOrderDetailService productOrderDetailService;
+ @Autowired
+ private IProductOrderRecordService productOrderRecordService;
@Autowired
private IBusinessRecordsService businessRecordsService;
@Autowired
@@ -72,13 +78,15 @@
@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) {
+ @PostMapping("/alldata")
+ public PageResult findAllDataList(@RequestParam Map<String, Object> params) {
if (params.size() == 0) {
params.put("page", 1);
params.put("limit", 10);
}
- return productOrderDetailService.findAllList(params);
+ if(params.get("diagnosticHospitalId")==null)
+ return PageResult.<ProductOrderJoinDetail>builder().data(null).code(0).count(0L).build();
+ return productOrderDetailService.findAllDataList(params);
}
/**
@@ -123,7 +131,7 @@
*/
@ApiOperation(value = "保存")
@PostMapping
- public ResultBody save(@Valid @RequestBody ProductOrderDetail productOrderDetail, BindingResult bindingResult) {
+ public ResultBody save(@Valid @RequestBody ProductOrderDetail productOrderDetail, BindingResult bindingResult,@LoginUser SysUser sysUser) {
List<String> errMsg = new ArrayList<>();
if (bindingResult.hasErrors()) {
for (ObjectError error : bindingResult.getAllErrors()) {
@@ -131,6 +139,10 @@
}
return ResultBody.failed().msg(errMsg.toString());
} else {
+ List<SysOrganization> organizations = sysUser.getOrganizations();
+ if(organizations.size()>0){
+ productOrderDetail.setCreateUserOrgCode(organizations.get(organizations.size()-1).getOrgCode());
+ }
boolean v = productOrderDetailService.saveOrUpdate(productOrderDetail);
if (v) {
return ResultBody.ok().data(productOrderDetail).msg("保存成功");
@@ -154,22 +166,37 @@
}
return ResultBody.failed().msg(errMsg.toString());
} else {
- //int v = productOrderDetailService.batchInsert(list);
- for (int i = 0; i < list.size(); i++) {
- if (!productOrderDetailService.saveOrUpdate(list.get(i))) {
- //写入订单明细失败，则删除订单记录数据
- Boolean e = productOrderService.removeById(list.get(0).getOrderId());
-// //删除已写入的订单明细
-// Map<String, Object> idList = new HashMap<String, Object>();
-// idList.put("orderId", list.get(i).getOrderId());
-// boolean delDetail = productOrderDetailService.removeByMap(idList);
- if (e)
- return ResultBody.failed().msg("充值数据保存失败，订单已撤回！");
- else
- return ResultBody.failed().msg("充值数据保存失败，订单撤回失败！");
- }
+ //写充值套餐给用户
+ Boolean v = productOrderDetailService.saveBatch(list);
+ //写充值记录
+ //对象转换
+ 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 {
+ //写入订单明细失败，则删除订单记录数据
+ Boolean e = productOrderService.removeById(list.get(0).getOrderId());
+ if (e)
+ return ResultBody.failed().msg("充值数据保存失败，订单已撤回！");
+ else
+ return ResultBody.failed().msg("充值数据保存失败，订单撤回失败！");
}
- return ResultBody.ok().data(list.size()).msg("产品充值成功");
}
}
@@ -216,4 +243,15 @@
}
return resultBody;
}
+
+ /**
+ * 获取 用户的状态 为试用状态还是 启用状态
+ *
+ * @return
+ */
+ @ApiOperation(value = "获取 用户的状态")
+ @GetMapping("/getTypeByUser")
+ public ResultBody getTypeByUser(@LoginUser SysUser sysUser) {
+ return productOrderDetailService.getTypeByUser(sysUser);
+ }
}
--
Gitblit v1.8.0