大后台

src/main/java/common/controller/ContractController.java

@@ -14,6 +14,7 @@ import org.springframework.http.HttpStatus;
 import org.springframework.http.MediaType;
 import org.springframework.http.ResponseEntity;
 import org.springframework.stereotype.Controller;
+import org.springframework.util.StringUtils;
 import org.springframework.web.bind.annotation.*;
 import security.annotation.CurrentAccount;
 import util.NewUserLogThread;
@@ -74,7 +75,7 @@ public class ContractController {
         if(ValidateUtil.isValid(contractList)){
             for (Contract c : contractList){
                 sb.append(c.getDs()).append(",").append(c.getContractCode()).append(",").append(c.getEmail()).append(",").append(c.getCustomerBody()).append(",").append(c.getSaleName()).append(",")
-                        .append(c.getStartDate()).append(",").append(c.getEndDate()).append(",").append(c.getPriceLevelName()).append(",").append(c.getMoney()).append(",").append(c.getRebateMoney()).append(",")
+                        .append(c.getStartDate()).append(",").append(c.getEndDate()).append(",").append(c.getPriceLevelName()).append(",").append(c.getMoney()).append(",").append(c.getPayMoney()).append(",")
                         .append(CONTRACT_STATUS.get(c.getStatus())).append("\r\n");
             }
         }
@@ -208,6 +209,7 @@ public class ContractController {
         Contract contract1 = service.update(loginAccount, contract);
         NewUserLogThread userlog = new NewUserLogThread(loginAccount.getEmail(), loginAccount.getName(), OperateObjectTypeEnum.CUSTOMER.getKey(), contract1.getContractCode(), "修改合同","",contract1.toString(), request, platform);
         userlog.start();
+
         return ResultModel.OK(contract1);
     }
 
@@ -223,9 +225,8 @@ public class ContractController {
     @RequestMapping(value = "change", method = RequestMethod.POST)
     @ResponseBody
     public ResultModel change(@CurrentAccount User loginAccount,
-                              @RequestBody FlowChange flowChange,
                               @RequestBody ContractChange contract, HttpServletRequest request, @PathVariable String platform) {
-        Contract contract1 = service.change(loginAccount, contract,flowChange);
+        Contract contract1 = service.change(loginAccount, contract,null);
         NewUserLogThread userlog = new NewUserLogThread(loginAccount.getEmail(), loginAccount.getName(), OperateObjectTypeEnum.CUSTOMER.getKey(), contract1.getContractCode(), "修改套餐","",contract1.toString(), request, platform);
         userlog.start();
         return ResultModel.OK(contract1);
@@ -288,7 +289,6 @@ public class ContractController {
     @RequestMapping(value = "trade", method = RequestMethod.GET)
     @ResponseBody
     public ResultModel baseCreate( @PathVariable String platform) {
-
         return ResultModel.OK(service.getTradeData(platform));
     }
 
@@ -317,6 +317,20 @@ public class ContractController {
     }
 
 
+    /**
+     * 删除记录
+     * @param platform
+     * @param
+     * @return
+     */
+    @RequestMapping(value = "change/del", method = RequestMethod.GET)
+    @ResponseBody
+    public ResultModel changesDel( @PathVariable String platform,String id,String type) {
+
+        return ResultModel.OK(service.changesDel(platform,id,type));
+    }
+
+
 
 
 }

src/main/java/common/model/Contract.java

@@ -35,7 +35,7 @@ public class Contract {
     private String status;
     private String saleName;
 
-    private Long payMoney;
+    private Long payMoney; // 回款金额
     private Long invoice;  // 开票次数
     private BigDecimal invoiceMoney;  // 发票金额
     private String createName; // 创建人NAME
@@ -57,16 +57,21 @@ public class Contract {
      */
 //    private Long discountFlow; // 优惠流量
     private Long discountTimeLong; // 优惠时长
-    private BigDecimal rebateMoney; //回款金额
+//    private BigDecimal rebateMoney; //回款金额
 
     private String customerShort;// 客户简称
     private String customerThird;// 三方客户
     private int tradeType; // 行业id
     private Long relationContract;// 关联合同id
-//    private String createrName; // 录入人
+
+
     private String relationCode;// 关联合同编号
     private String hasDiscount;// 是否有优惠
 
+    private String erroMessage;
+
+
+
 
 
     @Id
@@ -259,9 +264,9 @@ public class Contract {
         return invoice;
     }
 
-    public BigDecimal getRebateMoney() {
-        return rebateMoney;
-    }
+//    public BigDecimal getRebateMoney() {
+//        return rebateMoney;
+//    }
 
     public BigDecimal getInvoiceMoney() {
         return invoiceMoney;
@@ -271,9 +276,9 @@ public class Contract {
         this.invoiceMoney = invoiceMoney;
     }
 
-    public void setRebateMoney(BigDecimal rebateMoney) {
-        this.rebateMoney = rebateMoney;
-    }
+//    public void setRebateMoney(BigDecimal rebateMoney) {
+//        this.rebateMoney = rebateMoney;
+//    }
 
     public void setInvoice(Long invoice) {
         this.invoice = invoice;
@@ -343,6 +348,15 @@ public class Contract {
         this.hasDiscount = hasDiscount;
     }
 
+    @Transient
+    public String getErroMessage() {
+        return erroMessage;
+    }
+
+    public void setErroMessage(String erroMessage) {
+        this.erroMessage = erroMessage;
+    }
+
     public void setPriceLevelName(String priceLevelName) {
         this.priceLevelName = priceLevelName;
     }

src/main/java/common/model/ContractChange.java

 package common.model;
 
-import javax.persistence.Entity;
-import javax.persistence.GeneratedValue;
-import javax.persistence.GenerationType;
-import javax.persistence.Id;
+import javax.persistence.*;
 import java.util.Date;
 
 /**
@@ -30,6 +27,10 @@ public class ContractChange {
     private Long createAccount;
     private Date modifyTime;
     private Date createTime;
+    private int delFlag = 0;
+
+    private Long extraFlow; // 优惠流量
+    private Long discountTimeLong; // 优惠时长
 
     @Id
     @GeneratedValue(strategy = GenerationType.IDENTITY)
@@ -176,4 +177,30 @@ public class ContractChange {
     public void setMarke(String marke) {
         this.marke = marke;
     }
+
+    public int getDelFlag() {
+        return delFlag;
+    }
+
+    public void setDelFlag(int delFlag) {
+        this.delFlag = delFlag;
+    }
+
+    @Transient
+    public Long getExtraFlow() {
+        return extraFlow;
+    }
+
+    public void setExtraFlow(Long extraFlow) {
+        this.extraFlow = extraFlow;
+    }
+
+    @Transient
+    public Long getDiscountTimeLong() {
+        return discountTimeLong;
+    }
+
+    public void setDiscountTimeLong(Long discountTimeLong) {
+        this.discountTimeLong = discountTimeLong;
+    }
 }

src/main/java/common/model/ContractMoney.java

@@ -25,6 +25,7 @@ public class ContractMoney {
     private Long createAccount;
     private Date modifyTime;
     private Date createTime;
+    private int delFlag = 0;
 
     @Id
     @GeneratedValue
@@ -139,4 +140,12 @@ public class ContractMoney {
     public void setPlatform(String platform) {
         this.platform = platform;
     }
+
+    public int getDelFlag() {
+        return delFlag;
+    }
+
+    public void setDelFlag(int delFlag) {
+        this.delFlag = delFlag;
+    }
 }

src/main/java/common/model/FlowChange.java

@@ -13,8 +13,8 @@ public class FlowChange {
     private Long discountTimeLong; // 优惠时长
     private Long discountFlow; // 优惠时长
     private Long modifyUser;
-    private String modifyUname;
-    private String addDate;
+    private String modifyUname;//操作人
+    private String addDate; // ds
     private Date addTime;
     private int DelFlag;
     private String marke; //备注

src/main/java/common/repository/ContractChangeRepository.java

@@ -13,7 +13,7 @@ import java.util.List;
 @Transactional
 public interface ContractChangeRepository extends JpaRepository<ContractChange, Long> {
 
-    @Query(value="select * from contract_change where ds >= ?1 and ds <= ?2 and contract_code = ?3 order by ds desc",nativeQuery=true)
+    @Query(value="select * from contract_change where ds >= ?1 and ds <= ?2 and contract_code = ?3 and del_flag is not true order by ds desc",nativeQuery=true)
     List<ContractChange> findByDs(String startDate, String endDate, String code);
 
     @Query(value="SELECT * from contract_change where platform = ?1 and email = ?2 and ds >= ?3 and ds <= ?4 order by ds desc",nativeQuery=true)

src/main/java/common/repository/ContractMoneyRepository.java

@@ -12,7 +12,7 @@ import java.util.List;
 @Transactional
 public interface ContractMoneyRepository extends JpaRepository<ContractMoney, Long> {
 
-    @Query(value="select * from contract_money where ds >= ?1 and ds <= ?2 and contract_code = ?3  order by ds desc",nativeQuery=true)
+    @Query(value="select * from contract_money where ds >= ?1 and ds <= ?2 and contract_code = ?3  and del_flag is not true  order by ds desc",nativeQuery=true)
     List<ContractMoney> findByDs(String startDate, String endDate, String code);
 
     @Query(value="select * from contract_money where ds >= ?1 and ds <= ?2  and platform = ?3 order by ds desc",nativeQuery=true)

src/main/java/common/repository/FlowChangeRepository.java

@@ -8,6 +8,6 @@ import java.util.List;
 
 public interface FlowChangeRepository extends JpaRepository<FlowChange, Long> {
 
-    @Query(value = "select * from flow_change where contract_code= 1? and add_date >=2? and add_date <= 3?",nativeQuery = true)
+    @Query(value = "select * from flow_change where contract_code= ?3 and add_date >=?1 and add_date <= ?2 and del_flag is not true order by add_date desc",nativeQuery = true)
     List<FlowChange> findByAddDate(String startDate, String endDate, String code);
 }

src/main/java/common/service/ContractService.java

@@ -62,4 +62,6 @@ public interface ContractService {
     Map contractCodeCheck(String platform, String contractCode);
 
     List<FlowChange> findflowChange(String startDate, String endDate, String code);
+
+    Object changesDel(String platform, String id, String type);
 }
\ No newline at end of file

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

@@ -289,11 +289,15 @@ public class ContractServiceImpl implements ContractService {
             return null;
         }
 
-        Contract contractExist = contractRepository.findByCodePlatform(resource.getContractCode(), resource.getPlatform());
+        Contract contractExist = contractRepository.findByCode(resource.getContractCode());
 
         if (contractExist != null) {
+            contractExist = new Contract();
             // 合同编号已存在
-            return null;
+            contractExist.setId(-100L);
+            contractExist.setErroMessage("合同编号已存在");
+
+            return contractExist;
         }
 
 
@@ -542,78 +546,123 @@ 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();
-        cc.setType("update");
-        cc.setUser(loginUser.getId());
-        cc.setDs(DateUtil.getBeforeDays(0));
-        cc.setContent("");
-        cc.setEmail(contract.getEmail());
-        cc.setCompany(contract.getCustomerBody());
-        cc.setContractCode(contract.getContractCode());
 
 
-
-        this.dealContractStatus(resource,loginUser,"update");
+        Contract contract = contractRepository.findOne(resource.getId());
 
 
-        if (!resource.getStartDate().equals(contract.getStartDate())) {
-            cc.setContent(cc.getContent() + "开始时间变更 : " + contract.getStartDate() + "-->" + resource.getStartDate());
-            contract.setStartDate(resource.getStartDate());
-//            if(DateUtil.getBeforeDays(0).compareTo(resource.getStartDate()) < 0){
-//                contract.setStatus("wait");
-//            }else{
-//                contract.setStatus("executing");
-//            }
+        if(!contract.getContractCode().equals(resource.getContractCode())){
+            Contract contractExist = contractRepository.findByCode(resource.getContractCode());
+            if (contractExist != null) {
+                // 合同编号已存在
+                contractExist = new Contract();
+                contractExist.setId(-100L);
+                contractExist.setErroMessage("合同编号已存在");
+                return contractExist;
             }
-        if (!resource.getEndDate().equals(contract.getEndDate())) {
-            cc.setContent(cc.getContent() + "   结束时间变更 : " + contract.getEndDate() + "-->" + resource.getEndDate());
-            contract.setEndDate(resource.getEndDate());
         }
 
-        boolean newRebat = false;
-        if (contract.getType().equals(ContractTypeEnum.MAIN.getKey()) && null != resource.getPriceLevel()) {
-            if (!resource.getPriceLevel().equals(contract.getPriceLevel())) {
-                cc.setContent(cc.getContent() + "  套餐变更：" + packageMap.get(contract.getPriceLevel()) + "-->" + packageMap.get(resource.getPriceLevel()));
-                newRebat = true;
-                contract.setPriceLevel(resource.getPriceLevel());
-            }
-        }
+        this.dealContractStatus(resource,loginUser,"update");
 
-        if (!resource.getMoney().equals(contract.getMoney())) {
-            cc.setContent(cc.getContent() + "   金额变更： " + contract.getMoney() + "-->" + resource.getMoney());
-            newRebat = true;
-            contract.setMoney(resource.getMoney());
-        }
+        this.saveContractRelations(resource,contract.getId());
 
-        if (!resource.getRebateMoney().equals(contract.getRebateMoney())) {
-            cc.setContent(cc.getContent() + "  回款金额变更： " + contract.getMoney() + "-->" + resource.getMoney());
-            newRebat = true;
-            contract.setMoney(resource.getMoney());
+//        contract.setStatus(resource.getStatus());
+//        contract.setExtraFlow(resource.getExtraFlow());
+//        contract.setTradeType(resource.getTradeType());
+//        contract.setInvoiceMoney(resource.getInvoiceMoney());
+//        contract.setRelationContract(resource.getRelationContract());
+//        contract.setRebateMoney(resource.getRebateMoney());
+//        contract.setDiscountTimeLong(resource.getDiscountTimeLong());
+
+        resource.setCreateName(contract.getCreateName());
+        resource.setCreateAccount(contract.getCreateAccount());
+        resource.setCreateTime(contract.getCreateTime());
+        resource.setDs(contract.getDs());
+        resource.setProduct(contract.getProduct());
+
+        resource.setModifyTime(new Date());
+        if (null != loginUser) {
+            resource.setModifyAccount(loginUser.getId());
         }
+        resource.setModifyAccount(loginUser.getId());
+        resource.setId(contract.getId());
+
+        return contractRepository.save(resource);
 
-        if (!resource.getSale().equals(contract.getSale())) {
-            cc.setContent(cc.getContent() + "销售变更：" + saleMap.get(contract.getSale()) + "-->" + saleMap.get(resource.getSale()));
-            contract.setSale(resource.getSale());
     }
 
-//        if (newRebat && !"adi".equals(contract.getPlatform())) {
-//            Double rebat = getRebat(contract.getProduct(), contract.getPriceLevel().intValue(), contract.getMoney());
-//            BigDecimal bg = new BigDecimal(rebat);
-//            double f1 = bg.setScale(2, BigDecimal.ROUND_HALF_UP).doubleValue();
-////            contract.setRebate(f1);
-//        }
 
-        if (!resource.getSale().equals(contract.getSale())) {
-            cc.setContent(cc.getContent() + "销售变更：" + saleMap.get(contract.getSale()) + "-->" + saleMap.get(resource.getSale()));
-            contract.setSale(resource.getSale());
-        }
+    public Contract update_bak(User loginUser, Contract resource) {
+//        Map<Long, String> packageMap = getPackageMap();
+//        Map<Long, String> saleMap = getSaleMap();
+//        Contract contract = contractRepository.findOne(resource.getId());
+//
+//        ContractChange cc = new ContractChange();
+//        cc.setType("update");
+//        cc.setUser(loginUser.getId());
+//        cc.setDs(DateUtil.getBeforeDays(0));
+//        cc.setContent("");
+//        cc.setEmail(contract.getEmail());
+//        cc.setCompany(contract.getCustomerBody());
+//        cc.setContractCode(contract.getContractCode());
+//        this.dealContractStatus(resource,loginUser,"update");
+
+
+//        if (!resource.getStartDate().equals(contract.getStartDate())) {
+//            cc.setContent(cc.getContent() + "开始时间变更 : " + contract.getStartDate() + "-->" + resource.getStartDate());
+//            contract.setStartDate(resource.getStartDate());
+////            if(DateUtil.getBeforeDays(0).compareTo(resource.getStartDate()) < 0){
+////                contract.setStatus("wait");
+////            }else{
+////                contract.setStatus("executing");
+////            }
+//        }
+//        if (!resource.getEndDate().equals(contract.getEndDate())) {
+//            cc.setContent(cc.getContent() + "   结束时间变更 : " + contract.getEndDate() + "-->" + resource.getEndDate());
+//            contract.setEndDate(resource.getEndDate());
+//        }
+//
+//        boolean newRebat = false;
+//        if (contract.getType().equals(ContractTypeEnum.MAIN.getKey()) && null != resource.getPriceLevel()) {
+//            if (!resource.getPriceLevel().equals(contract.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() + "   金额变更： " + contract.getMoney() + "-->" + resource.getMoney());
+//            newRebat = true;
+//            contract.setMoney(resource.getMoney());
+//        }
+//
+//        if (!resource.getRebateMoney().equals(contract.getRebateMoney())) {
+//            cc.setContent(cc.getContent() + "  回款金额变更： " + contract.getMoney() + "-->" + resource.getMoney());
+//            newRebat = true;
+//            contract.setMoney(resource.getMoney());
+//        }
+//
+//        if (!resource.getSale().equals(contract.getSale())) {
+//            cc.setContent(cc.getContent() + "销售变更：" + saleMap.get(contract.getSale()) + "-->" + saleMap.get(resource.getSale()));
+//            contract.setSale(resource.getSale());
+//        }
+//
+////        if (newRebat && !"adi".equals(contract.getPlatform())) {
+////            Double rebat = getRebat(contract.getProduct(), contract.getPriceLevel().intValue(), contract.getMoney());
+////            BigDecimal bg = new BigDecimal(rebat);
+////            double f1 = bg.setScale(2, BigDecimal.ROUND_HALF_UP).doubleValue();
+//////            contract.setRebate(f1);
+////        }
+//
+//        if (!resource.getSale().equals(contract.getSale())) {
+//            cc.setContent(cc.getContent() + "销售变更：" + saleMap.get(contract.getSale()) + "-->" + saleMap.get(resource.getSale()));
+//            contract.setSale(resource.getSale());
+//        }
 
-        cc.setPlatform(contract.getPlatform());
-        contractChangeRepository.save(cc);
+//        cc.setPlatform(contract.getPlatform());
+//        contractChangeRepository.save(cc);
 
         //同步修改trackingio的数据
 //        if (contract.getPlatform().equals("tkio") && resource.getType().equals("main")) {
@@ -650,38 +699,39 @@ public class ContractServiceImpl implements ContractService {
 //
 //        }
 
-        contract.setStatus(resource.getStatus());
-        contract.setExtraFlow(resource.getExtraFlow());
-        contract.setTradeType(resource.getTradeType());
-        contract.setInvoiceMoney(resource.getInvoiceMoney());
-        contract.setRelationContract(resource.getRelationContract());
-        contract.setRebateMoney(resource.getRebateMoney());
-        contract.setDiscountTimeLong(resource.getDiscountTimeLong());
-
-        contract.setModifyTime(new Date());
-        if (null != loginUser) {
-            resource.setModifyAccount(loginUser.getId());
-        }
-
-
-        this.saveContractRelations(resource,contract.getId());
-
-        return contractRepository.save(contract);
+//        contract.setStatus(resource.getStatus());
+//        contract.setExtraFlow(resource.getExtraFlow());
+//        contract.setTradeType(resource.getTradeType());
+//        contract.setInvoiceMoney(resource.getInvoiceMoney());
+//        contract.setRelationContract(resource.getRelationContract());
+//        contract.setRebateMoney(resource.getRebateMoney());
+//        contract.setDiscountTimeLong(resource.getDiscountTimeLong());
+//
+//        contract.setModifyTime(new Date());
+//        if (null != loginUser) {
+//            resource.setModifyAccount(loginUser.getId());
+//        }
+//
+//
+//        this.saveContractRelations(resource,contract.getId());
+//
+//        return contractRepository.save(contract);
+        return null;
     }
 
 
     private void dealContractStatus(Contract resource,User loginUser,String type){
 
-        if (resource.getRebateMoney() != null) {
+        if (resource.getPayMoney() != null) {
             if (resource.getMoney() == null) {
                 resource.setMoney(0L);
             }
 
-            if (resource.getRebateMoney().compareTo(BigDecimal.ZERO) <= 0) {
+            if (resource.getPayMoney().longValue() <= 0) {
                 //未回款
                 resource.setStatus(ContractStatusEnum.MONEY_BACK_NONE.getKey());
 
-            }else if(resource.getRebateMoney().compareTo(new BigDecimal(resource.getMoney()+""))< 0){
+            }else if(resource.getPayMoney().longValue() < resource.getMoney().longValue()){
                 // 部分回款
                 resource.setStatus(ContractStatusEnum.MONEY_BACK_PART.getKey());
 
@@ -707,8 +757,8 @@ public class ContractServiceImpl implements ContractService {
             resource.setStatus(ContractStatusEnum.MONEY_BACK_NONE.getKey());
         }
 
-        if (resource.getRebateMoney() == null) {
-            resource.setRebateMoney(new BigDecimal(0));
+        if (resource.getPayMoney() == null) {
+            resource.setPayMoney(0L);
         }
 
         if (resource.getInvoiceMoney() == null) {
@@ -730,7 +780,7 @@ public class ContractServiceImpl implements ContractService {
 
         if(resource.getDiscountTimeLong()> 0 || resource.getExtraFlow()> 0){
             //记录优惠信息
-            saveFlowChange(resource,loginUser,type);
+            saveFlowChange(resource,loginUser,type, resource.getDiscountTimeLong(), resource.getExtraFlow());
         }
     }
 
@@ -763,15 +813,15 @@ public class ContractServiceImpl implements ContractService {
     }
 
     // 保存优惠流量 优惠时长 记录
-    private void saveFlowChange(Contract contract,User loginUser,String type){
+    private void saveFlowChange(Contract contract, User loginUser, String type, Long discountTimeLong, Long extraFlow){
 
         if(!"save".equals(type)){
             return;
         }
 
         FlowChange  change = new FlowChange();
-        change.setDiscountFlow(contract.getExtraFlow());
-        change.setDiscountTimeLong(contract.getDiscountTimeLong());
+        change.setDiscountFlow(extraFlow);
+        change.setDiscountTimeLong(discountTimeLong);
         change.setAddDate(new DateTime().toString("yyyy-MM-dd"));
         change.setAddTime(new Date());
         change.setCompany(contract.getMyBodyName());
@@ -1027,9 +1077,9 @@ public class ContractServiceImpl implements ContractService {
     public ContractMoney pay(User loginUser, ContractMoney resource) {
         Contract contract = contractRepository.findByCode(resource.getContractCode());
         if (resource.getType().equals("pay")) {
-            contract.setPayMoney(contract.getPayMoney() + resource.getMoney());
+            contract.setPayMoney(contract.getPayMoney()+resource.getMoney());
         } else {
-            contract.setInvoice(contract.getInvoice() + resource.getMoney());
+            contract.setInvoiceMoney(contract.getInvoiceMoney().add(new BigDecimal(resource.getMoney().toString())) );
         }
 
         if (contract.getType().equals(ContractTypeEnum.INCREMENT.getKey())) {
@@ -1042,11 +1092,11 @@ public class ContractServiceImpl implements ContractService {
         resource.setCreateTime(new Date());
         resource.setUser(loginUser.getId());
 
-        if (resource.getType().equals("pay") && contract.getPlatform().equals("tkio")) {
-            tkioAccountService.contractPay(loginUser, resource);
-        } else if (resource.getType().equals("pay") && contract.getPlatform().equals("io")) {
-            ioAccountService.contractPay(loginUser, resource);
-        }
+//        if (resource.getType().equals("pay") && contract.getPlatform().equals("tkio")) {
+//            tkioAccountService.contractPay(loginUser, resource);
+//        } else if (resource.getType().equals("pay") && contract.getPlatform().equals("io")) {
+//            ioAccountService.contractPay(loginUser, resource);
+//        }
         return contractMoneyRepository.save(resource);
     }
 
@@ -1059,15 +1109,15 @@ public class ContractServiceImpl implements ContractService {
 //            resource.setContent("套餐变更 ：" + packageMap.get(contract.getPriceLevel()) + "-->" + packageMap.get(resource.getLevel())
 //                    + " 金额变更 ：" + contract.getMoney() + "-->" + (resource.getMoney() + contract.getMoney()));
 
-            resource.setContent(packageMap.get(contract.getPriceLevel()+"改为"+packageMap.get(resource.getLevel())));
-            resource.setContent(contract.getMoney()+"元改为"+resource.getMoney()+"元");
+            resource.setContent(packageMap.get(contract.getPriceLevel())+"改为"+packageMap.get(resource.getLevel()));
+            resource.setMarke(contract.getMoney()+"元改为"+resource.getMoney()+"元");
             contract.setMoney(resource.getMoney() + contract.getMoney());
             contract.setPriceLevel(resource.getLevel());
 
-            Double rebat = getRebat(contract.getProduct(), contract.getPriceLevel().intValue(), contract.getMoney());
-            BigDecimal bg = new BigDecimal(rebat);
-            double f1 = bg.setScale(2, BigDecimal.ROUND_HALF_UP).doubleValue();
-            contract.setRebate(f1);
+//            Double rebat = getRebat(contract.getProduct(), contract.getPriceLevel().intValue(), contract.getMoney());
+//            BigDecimal bg = new BigDecimal(rebat);
+//            double f1 = bg.setScale(2, BigDecimal.ROUND_HALF_UP).doubleValue();
+//            contract.setRebate(f1);
 
 //            //同步修改trackingio的数据
 //            if (contract.getPlatform().equals("tkio")) {
@@ -1076,10 +1126,17 @@ public class ContractServiceImpl implements ContractService {
 //                accountIOService.update(contract);
 //            }
         }else if("give".equals(resource.getType())){
-            //变更优惠
-            this.saveFlowChange(contract,loginUser,"save");
-            contract.setExtraFlow(contract.getExtraFlow()+flowChange.getDiscountFlow());
-            contract.setDiscountTimeLong(contract.getDiscountTimeLong()+flowChange.getDiscountTimeLong());
+            //变更优惠记录
+            this.saveFlowChange(contract,loginUser,"save",resource.getDiscountTimeLong(),resource.getExtraFlow());
+            // 累加 合同表中数据
+
+            if(resource.getExtraFlow()!=null){
+                contract.setExtraFlow(contract.getExtraFlow()+resource.getExtraFlow());
+            }
+
+            if(resource.getDiscountTimeLong()!=null){
+                contract.setDiscountTimeLong(contract.getDiscountTimeLong()+resource.getDiscountTimeLong());
+            }
 
         } else {
 //            //同步修改trackingio的数据
@@ -1096,11 +1153,39 @@ public class ContractServiceImpl implements ContractService {
         resource.setCreateTime(new Date());
         resource.setDs(DateUtil.getBeforeDays(0));
         resource.setUser(loginUser.getId());
+
+        if(!"give".equals(resource.getType())){
             contractChangeRepository.save(resource);
+        }
 
         return contractRepository.save(contract);
     }
 
+
+    @Override
+    public Object changesDel(String platform, String id, String type) {
+
+        if("give".equals(type)){
+            // 优惠流量
+            FlowChange change = flowChangeRepository.findOne(Long.parseLong(id));
+            change.setDelFlag(1);
+            flowChangeRepository.save(change);
+            return change;
+        }else if("change".equals(type)){
+            //套餐变更
+            ContractChange contractChange = contractChangeRepository.findOne(Long.parseLong(id));
+            contractChange.setDelFlag(1);
+            contractChangeRepository.save(contractChange);
+            return contractChange;
+        }else{
+            ContractMoney contractMoney = contractMoneyRepository.findOne(Long.parseLong(id));
+            contractMoney.setDelFlag(1);
+            contractMoneyRepository.save(contractMoney);
+            return contractMoney;
+        }
+
+    }
+
     @Override
     public List<ContractMoney> findPay(String startDate, String endDate, String code) {
         List<User> sales = userRepository.findAll();
@@ -1157,14 +1242,17 @@ public class ContractServiceImpl implements ContractService {
         if (contractMoney.getType().equals("pay")) {
             contract.setPayMoney(contract.getPayMoney() + resource.getMoney() - contractMoney.getMoney());
         } else {
-            contract.setInvoice(contract.getInvoice() + resource.getMoney() - contractMoney.getMoney());
+//            contract.setInvoice(contract.getInvoice() + resource.getMoney() - contractMoney.getMoney());
+
+            contract.setInvoiceMoney(contract.getInvoiceMoney().add(new BigDecimal(resource.getMoney())).subtract(new BigDecimal(contractMoney.getMoney())));
+
         }
         Contract save = contractRepository.save(contract);
 
         contractMoney.setModifyAccount(loginUser.getId());
         contractMoney.setModifyTime(new Date());
         contractMoney.setMoney(resource.getMoney());
-        contractMoney.setDs(resource.getDs());
+//        contractMoney.setDs(resource.getDs());
         contractMoneyRepository.save(contractMoney);
 
         List<User> sales = userRepository.findAll();
@@ -1233,27 +1321,31 @@ public class ContractServiceImpl implements ContractService {
         }
 
         List<ContractRelation> ids = null;
-
-        if(!StringUtils.isEmpty(contractId)){
+        Contract contract = null;
+        if(!StringUtils.isEmpty(contractId) && !contractId.equals("null")){
             ids =  contractRelationRepository.findRelationIdsMain(contractId);
+            contract = contractRepository.findOne(Long.parseLong(contractId));
         }
 
         if (ids != null) {
 
             Map<String,String> filterMap = new HashMap();
             for(ContractRelation relation : ids){
+
+                if(contract!=null && !relation.getRelationId().equals(contract.getRelationContract())){
                     filterMap.put(relation.getRelationId()+"_","");
                 }
 
+            }
+
             List<Map> resultBefore = contractRepository.contractCodePlatform(plats);
             for (Map  m : resultBefore) {
 
                 String m_id = m.get("id").toString() + "_";
-                if (filterMap.get(m_id) == null && !m_id.equals(contractId+"_")) {
+                if (filterMap.get(m_id) == null &&  m_id.equals(contractId+"_")) {
                     result.add(m);
                 }
             }
-
         } else {
             result.addAll(contractRepository.contractCodePlatform(plats));
         }
@@ -1261,7 +1353,6 @@ public class ContractServiceImpl implements ContractService {
         return result;
     }
 
-
     @Override
     public Map contractCodeCheck(String platform, String contractCode) {
 
@@ -1278,7 +1369,8 @@ public class ContractServiceImpl implements ContractService {
     }
 
     public Map<Long, String> getPackageMap() {
-        List<PackageType> typeList = packageTypeRepository.findAll();
+//        List<PackageType> typeList = packageTypeRepository.findAll();
+        List<PackageType> typeList = packageTypeRepository.findIsNewAll();
         Map<Long, String> typeMap = new HashMap<>();
         if (ValidateUtil.isValid(typeList)) {
             for (PackageType s : typeList) {

src/main/java/util/ResultModel.java

@@ -39,6 +39,12 @@ public class ResultModel {
         this.content = "";
     }
 
+    public ResultModel(String erro) {
+        this.code = ResultStatus.FAILED.getCode();
+        this.message = erro;
+        this.content = "";
+    }
+
     public ResultModel(ResultStatus status, Object content) {
         this.code = status.getCode();
         this.message = status.getMessage();
@@ -57,6 +63,10 @@ public class ResultModel {
         return new ResultModel(error);
     }
 
+    public static ResultModel ERROR(String errorMessage) {
+        return new ResultModel(errorMessage);
+    }
+
     public int getCode() {
         return code;
     }

src/main/webapp/WEB-INF/web.xml

@@ -62,7 +62,7 @@
   </filter-mapping>
 
   <welcome-file-list>
-    <welcome-file>/system/index.html</welcome-file>
+    <welcome-file>/index.html</welcome-file>
   </welcome-file-list>
 
 </web-app>
\ No newline at end of file