From 77162dbce2f3c8334c3c7b3a80c0e46c83eaf402 Mon Sep 17 00:00:00 2001
From: houruijun <411269194@kidgrow.com>
Date: Tue, 11 Aug 2020 20:35:06 +0800
Subject: [PATCH] 1.修改首页统计数据的显示文字 2.修改删除删除充值记录后,读片量不扣减问题

---
 kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-server/src/main/java/com/kidgrow/oprationcenter/controller/ProductOrderController.java |   27 ++++++++++++++++++++++-----
 1 files changed, 22 insertions(+), 5 deletions(-)

diff --git a/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-server/src/main/java/com/kidgrow/oprationcenter/controller/ProductOrderController.java b/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-server/src/main/java/com/kidgrow/oprationcenter/controller/ProductOrderController.java
index fe8ae77..93e048a 100644
--- a/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-server/src/main/java/com/kidgrow/oprationcenter/controller/ProductOrderController.java
+++ b/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-server/src/main/java/com/kidgrow/oprationcenter/controller/ProductOrderController.java
@@ -1,8 +1,11 @@
 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.ProductOrder;
 import com.kidgrow.oprationcenter.service.IBusinessRecordsService;
 import com.kidgrow.oprationcenter.service.IProductOrderService;
@@ -13,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.*;
@@ -51,12 +55,12 @@
             @ApiImplicitParam(name = "limit", value = "分页结束位置", required = true, dataType = "Integer")
     })
     @GetMapping
-    public PageResult list(@RequestParam Map<String, Object> params) {
+    public PageResult list(@RequestParam Map<String, Object> params, @LoginUser SysUser sysUser) {
         if (params.size() == 0) {
             params.put("page", 1);
             params.put("limit", 10);
         }
-        return productOrderService.findList(params);
+        return productOrderService.findList(params,sysUser);
     }
 
     /**
@@ -84,7 +88,7 @@
      */
     @ApiOperation(value = "保存")
     @PostMapping
-    public ResultBody save(@Valid @RequestBody ProductOrder productOrder, BindingResult bindingResult) {
+    public ResultBody save(@Valid @RequestBody ProductOrder productOrder, BindingResult bindingResult,@LoginUser SysUser sysUser) {
         List<String> errMsg = new ArrayList<>();
         if (bindingResult.hasErrors()) {
             for (ObjectError error : bindingResult.getAllErrors()) {
@@ -92,6 +96,12 @@
             }
             return ResultBody.failed().msg(errMsg.toString());
         } else {
+            List<SysOrganization> organizations = sysUser.getOrganizations();
+            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("保存成功");
@@ -106,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("删除成功");
@@ -140,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;

--
Gitblit v1.8.0