app排序

src/main/java/common/service/impl/ContractServiceImpl.java

@@ -119,6 +119,8 @@ public class ContractServiceImpl implements ContractService{
 
     @Override
     public Contract update(User loginUser, Contract resource) {
+        Map<Long, String> packageMap = getPackageMap();
+        Map<Long, String> saleMap = getSaleMap();
         Contract contract = contractRepository.findOne(resource.getId());
 
         ContractChange cc = new ContractChange();
@@ -131,7 +133,7 @@ public class ContractServiceImpl implements ContractService{
         cc.setContractCode(contract.getContractCode());
 
         if(!resource.getStartDate().equals(contract.getStartDate())){
-            cc.setContent(cc.getContent() + "startDate changed : " + contract.getStartDate() + "-->" + resource.getStartDate());
+            cc.setContent(cc.getContent() + "开始时间变更 : " + contract.getStartDate() + "-->" + resource.getStartDate());
             contract.setStartDate(resource.getStartDate());
             if(DateUtil.getBeforeDays(0).compareTo(resource.getStartDate()) > 0){
                 contract.setStatus("wait");
@@ -140,25 +142,25 @@ public class ContractServiceImpl implements ContractService{
             }
         }
         if(!resource.getEndDate().equals(contract.getEndDate())){
-            cc.setContent(cc.getContent() + "   endDate changed : " + contract.getEndDate() + "-->" + resource.getEndDate());
+            cc.setContent(cc.getContent() + "   结束时间变更 : " + contract.getEndDate() + "-->" + resource.getEndDate());
             contract.setEndDate(resource.getEndDate());
         }
 
         boolean newRebat = false;
         if(!resource.getPriceLevel().equals(contract.getPriceLevel())){
-            cc.setContent(cc.getContent() + "   priceLevel changed : " + contract.getPriceLevel() + "-->" + resource.getPriceLevel());
+            cc.setContent(cc.getContent() +  "  " + packageMap.get(contract.getPriceLevel()) + "-->" + packageMap.get(resource.getPriceLevel()));
             newRebat = true;
             contract.setPriceLevel(resource.getPriceLevel());
         }
 
         if(!resource.getMoney().equals(contract.getMoney())){
-            cc.setContent(cc.getContent() + "   money changed : " + contract.getMoney() + "-->" + resource.getMoney());
+            cc.setContent(cc.getContent() + "   金额 " + contract.getMoney() + "-->金额 " + resource.getMoney());
             newRebat = true;
             contract.setMoney(resource.getMoney());
         }
 
         if(!resource.getSale().equals(contract.getSale())){
-            cc.setContent(cc.getContent() + "   slae changed : " + contract.getSale() + "-->" + resource.getSale());
+            cc.setContent(cc.getContent() + "   销售 " + saleMap.get(contract.getSale()) + "-->销售 " + saleMap.get(resource.getSale()));
             contract.setSale(resource.getSale());
         }
 
@@ -252,10 +254,12 @@ public class ContractServiceImpl implements ContractService{
 
     @Override
     public Contract change(User loginUser, ContractChange resource) {
+        Map<Long, String> packageMap = getPackageMap();
+        Map<Long, String> saleMap = getSaleMap();
         Contract contract = contractRepository.findByCode(resource.getContractCode());
         if(resource.getType().equals("price")){
-            resource.setContent(" priceLevel changed : " + contract.getPriceLevel() + "-->" + resource.getLevel()
-                    + " money changed :" + contract.getMoney() + "-->" +(resource.getMoney() + contract.getMoney()));
+            resource.setContent("  " + packageMap.get(contract.getPriceLevel()) + "-->" + packageMap.get(resource.getLevel())
+                    + " 金额" + contract.getMoney() + "--> 金额 " +(resource.getMoney() + contract.getMoney()));
 
             contract.setMoney(resource.getMoney() + contract.getMoney());
             contract.setPriceLevel(resource.getLevel());
@@ -386,4 +390,26 @@ public class ContractServiceImpl implements ContractService{
         }
         return result;
     }
+
+    public Map<Long, String> getPackageMap(){
+        List<PackageType> typeList = packageTypeRepository.findAll();
+        Map<Long, String> typeMap = new HashMap<>();
+        if(ValidateUtil.isValid(typeList)){
+            for(PackageType s: typeList){
+                typeMap.put(s.getId(), s.getPackageName());
+            }
+        }
+        return typeMap;
+    }
+
+    public Map<Long, String> getSaleMap(){
+        List<User> sales = userRepository.findAll();
+        Map<Long, String> saleMap = new HashMap<>();
+        if(ValidateUtil.isValid(sales)){
+            for(User s: sales){
+                saleMap.put(s.getId(), s.getName());
+            }
+        }
+        return saleMap;
+    }
 }

src/main/java/tkio/controller/TkioAccountController.java

 package tkio.controller;
 
-import common.model.BackVisit;
-import common.model.Payment;
-import common.model.Reminder;
-import common.model.User;
+import common.model.*;
 import common.service.UserService;
 import dic.OperateObjectTypeEnum;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -12,6 +9,7 @@ import org.springframework.web.bind.annotation.*;
 import security.annotation.CurrentAccount;
 import tkio.service.TkioAccountService;
 import util.ResultModel;
+import util.ResultStatus;
 import util.UserLogThread;
 
 import javax.servlet.http.HttpServletRequest;
@@ -36,7 +34,11 @@ public class TkioAccountController {
     @RequestMapping(value = "/findone", method = RequestMethod.GET)
     @ResponseBody
     public ResultModel findOne(@CurrentAccount User loginAccount, @RequestParam String email) {
-        return ResultModel.OK(tkioAccountService.findOne(email));
+        Account4Web account4Web = tkioAccountService.findOne(email);
+        if(null == account4Web){
+            return ResultModel.ERROR(ResultStatus.USER_EMPTY);
+        }
+        return ResultModel.OK(account4Web);
     }
     @RequestMapping(value = "/find/reminderlevel", method = RequestMethod.GET)
     @ResponseBody

src/main/java/track/controller/TrackAccountController.java

 package track.controller;
 
-import common.model.BackVisit;
-import common.model.Payment;
-import common.model.Reminder;
-import common.model.User;
+import common.model.*;
 import dic.OperateObjectTypeEnum;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
@@ -12,6 +9,7 @@ import security.annotation.CurrentAccount;
 import tkio.service.TkioAccountService;
 import track.service.TrackAccountService;
 import util.ResultModel;
+import util.ResultStatus;
 import util.UserLogThread;
 
 import javax.servlet.http.HttpServletRequest;
@@ -35,7 +33,11 @@ public class TrackAccountController {
     @RequestMapping(value = "/findone", method = RequestMethod.GET)
     @ResponseBody
     public ResultModel findOne(@CurrentAccount User loginAccount, @RequestParam String email) {
-        return ResultModel.OK(tkioAccountService.findOne(email));
+        TrackAccount4Web account4Web = tkioAccountService.findOne(email);
+        if(null == account4Web){
+            return ResultModel.ERROR(ResultStatus.USER_EMPTY);
+        }
+        return ResultModel.OK(account4Web);
     }
 
     //关闭到期提醒