From dc44aab8fb68744e3523604e6138a8edf7bd9a65 Mon Sep 17 00:00:00 2001
From: zhangyongzhangyong <2012005003@qq.coom>
Date: Tue, 1 Sep 2020 11:53:43 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AE=A2=E6=88=B7=E5=AE=9A=E5=88=B6=E5=8A=9F?=
 =?UTF-8?q?=E8=83=BD=E4=B8=8A=E6=9E=B6=EF=BC=8C=E4=B8=8D=E8=83=BD=E8=B6=85?=
 =?UTF-8?q?=E8=BF=8712=E4=B8=AA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../impl/CustomerFunctionDetailServiceImpl.java     | 13 +++++++++++++
 .../service/impl/FunctionCustomizedServiceImpl.java |  1 +
 2 files changed, 14 insertions(+)

diff --git a/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/service/impl/CustomerFunctionDetailServiceImpl.java b/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/service/impl/CustomerFunctionDetailServiceImpl.java
index 1d5650fbae..7d4a668843 100644
--- a/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/service/impl/CustomerFunctionDetailServiceImpl.java
+++ b/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/service/impl/CustomerFunctionDetailServiceImpl.java
@@ -153,6 +153,19 @@ public class CustomerFunctionDetailServiceImpl extends BaseServiceImpl<CustomerF
     @Override
     @Transactional(rollbackFor = Exception.class)
     public Result updateShoppingStatus(UpdateShoppingStatusFormDTO formDTO) {
+        // 用户定制功能上架，需判断，已上架的数量是否超过12
+        if (NumConstant.ONE_STR.equals(formDTO.getShoppingStatus())){
+            // 根据functionId，customerId、所属端，查询当前客户 现已上架的 功能数量。
+            CustomerFunctionDetailDTO functionDetailDTO = new CustomerFunctionDetailDTO();
+            functionDetailDTO.setFunctionId(formDTO.getFunctionId());
+            functionDetailDTO.setCustomerId(formDTO.getCustomerId());
+            CustomerFunctionCollectResultDTO functionNum = baseDao.sumCustomerFunctionNum(functionDetailDTO);
+            if (null != functionNum){
+                if (NumConstant.TWELVE <= functionNum.getNum()){
+                    return new Result().error(8000,"当前客户"+ functionNum.getFromAppName() +"已上架12个定制功能。不能继续上架！");
+                }
+            }
+        }
         // 修改 客户定制功能详情表，上下架状态
         baseDao.updateShoppingStatus(formDTO);
         // 保存日志记录到  客户定制功能上下架历史表
diff --git a/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/service/impl/FunctionCustomizedServiceImpl.java b/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/service/impl/FunctionCustomizedServiceImpl.java
index 611f7de98e..203b336cf9 100644
--- a/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/service/impl/FunctionCustomizedServiceImpl.java
+++ b/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/service/impl/FunctionCustomizedServiceImpl.java
@@ -359,6 +359,7 @@ public class FunctionCustomizedServiceImpl extends BaseServiceImpl<FunctionCusto
         this.upFunction(formDTO, NumConstant.ONE);
         // 2.修改 定制功能表, 修改的字段范围，是所有入参字段
         FunctionCustomizedEntity entity = ConvertUtils.sourceToTarget(formDTO, FunctionCustomizedEntity.class);
+        entity.setCustomizedName(formDTO.getFunctionName());
         baseDao.updateFunctionCustomized(entity);
     }