操作日志

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

@@ -357,4 +357,7 @@ public class ContractController {
 
 
 
+
+
+
 }

src/main/java/common/controller/UserLogController.java

@@ -51,4 +51,12 @@ public class UserLogController
         return ResultModel.OK(service.getChangeDelDetailData(loginAccount,pid));
     }
 
+    @RequestMapping(value = "change/del/recover", method = RequestMethod.GET)
+    @ResponseBody
+    public ResultModel changesDelRecover( @PathVariable String platform,@CurrentAccount User loginAccount,
+                                          HttpServletRequest request,String id,String type) {
+
+        return ResultModel.OK(service.changesDelRecover(platform,id,type,loginAccount));
+
+    }
 }

src/main/java/common/model/ChangeDelInfo.java

@@ -20,6 +20,8 @@ public class ChangeDelInfo {
     private Date creatTime;
     private String ds;
     private String ip;
+    private Long sourceId;
+    private String original;
 
     @Id
     @GeneratedValue
@@ -110,4 +112,20 @@ public class ChangeDelInfo {
     public void setDs(String ds) {
         this.ds = ds;
     }
+
+    public Long getSourceId() {
+        return sourceId;
+    }
+
+    public void setSourceId(Long sourceId) {
+        this.sourceId = sourceId;
+    }
+
+    public String getOriginal() {
+        return original;
+    }
+
+    public void setOriginal(String original) {
+        this.original = original;
+    }
 }

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

@@ -68,4 +68,6 @@ public interface ContractService {
     List<ChangeDelInfo> getChangeDelData(User loginAccount, String contranctCode, String startDate, String endDate);
 
     List<ChangeDelDetail> getChangeDelDetailData(User loginAccount, String pid);
+
+    ChangeDelInfo changesDelRecover(String platform, String id, String type, User loginAccount);
 }
\ No newline at end of file

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

@@ -55,7 +55,6 @@ public class ContractServiceImpl implements ContractService {
         put("2","合同变更记录");
         put("3","收款/开票记录");
         put("4","合同管理");
-
     }};
 
     @Autowired
@@ -1168,13 +1167,13 @@ public class ContractServiceImpl implements ContractService {
             this.saveChangeDelInfo(changeDelInfo,4,2,ip,loginUser); // type 2 修改
 
         } else {
-            contract.setStatus(ContractStatusEnum.DELETE.getKey());
             changeDelInfo.setDetail("删除合同");
+            changeDelInfo.setOriginal(contract.getStatus());
             this.saveChangeDelInfo(changeDelInfo,4,1,ip,loginUser);
+            contract.setStatus(ContractStatusEnum.DELETE.getKey());
 
         }
 
-
         return contractRepository.save(contract);
     }
 
@@ -1334,6 +1333,7 @@ public class ContractServiceImpl implements ContractService {
             ChangeDelInfo changeDelInfo = new ChangeDelInfo();
             changeDelInfo.setContractCode(change.getContractCode());
             changeDelInfo.setEmail(change.getEmail());
+            changeDelInfo.setSourceId(change.getId());
             changeDelInfo.setDetail("赠送时长:"+change.getDiscountTimeLong()+"天 — 赠送流量"+ change.getDiscountFlow());
 
             this.saveChangeDelInfo(changeDelInfo,1,1,ip,loginUser);
@@ -1349,10 +1349,12 @@ public class ContractServiceImpl implements ContractService {
             changeDelInfo.setContractCode(contractChange.getContractCode());
             changeDelInfo.setDetail("套餐变更");
             changeDelInfo.setEmail(contractChange.getEmail());
+            changeDelInfo.setSourceId(contractChange.getId());
             this.saveChangeDelInfo(changeDelInfo,2,1,ip,loginUser);
 
             return contractChange;
         }else{
+
             ContractMoney contractMoney = contractMoneyRepository.findOne(Long.parseLong(id));
             contractMoney.setDelFlag(1);
             contractMoneyRepository.save(contractMoney);
@@ -1362,12 +1364,10 @@ public class ContractServiceImpl implements ContractService {
             changeDelInfo.setEmail(contractMoney.getEmail());
 
             if("pay".equals(contractMoney.getType())){
-                // 删除收款记录 修改相应收款金额
-                Contract contract = contractRepository.findByCode(contractMoney.getContractCode());
-                contract.setPayMoney(contract.getPayMoney()-contractMoney.getMoney());
-                contractRepository.save(contract);
 
+                this.dealPayMoneyByContractMoney(contractMoney,-1);
                 changeDelInfo.setDetail("收款记录-金额:"+contractMoney.getMoney());
+
             }else{
                 changeDelInfo.setDetail("开票记录-金额:"+contractMoney.getMoney());
             }
@@ -1379,6 +1379,16 @@ public class ContractServiceImpl implements ContractService {
 
     }
 
+    private void dealPayMoneyByContractMoney(ContractMoney contractMoney,int addOr){
+        // 删除收款记录 修改相应收款金额
+        // 恢复收款记录 修改相应合同收款金额
+        Contract contract = contractRepository.findByCode(contractMoney.getContractCode());
+        contract.setPayMoney(contract.getPayMoney() + contractMoney.getMoney()*addOr);
+        contractRepository.save(contract);
+    }
+
+
+
     @Override
     public List<ChangeDelInfo> getChangeDelData(User loginAccount, String contranctCode, String startDate, String endDate) {
 
@@ -1394,6 +1404,47 @@ public class ContractServiceImpl implements ContractService {
         return datas;
     }
 
+
+    @Override
+    public ChangeDelInfo changesDelRecover(String platform, String id, String type, User loginAccount) {
+        // 恢复删除
+
+        ChangeDelInfo changeDelInfo = changeDelInfoRepository.findOne(Long.parseLong(id));
+        if(changeDelInfo.getModifyType()==1){
+//            put("1","流量赠送");
+//            put("2","合同变更记录");
+//            put("3","收款/开票记录");
+//            put("4","合同管理");
+            if(changeDelInfo.getFunction()==1){
+                FlowChange change = flowChangeRepository.findOne(changeDelInfo.getSourceId());
+                change.setDelFlag(0);
+                flowChangeRepository.save(change);
+            }else if(changeDelInfo.getFunction()==2){
+                ContractChange contractChange = contractChangeRepository.findOne(changeDelInfo.getSourceId());
+                contractChange.setDelFlag(0);
+                contractChangeRepository.save(contractChange);
+            }else if(changeDelInfo.getFunction()==3){
+                //
+                ContractMoney money = contractMoneyRepository.findOne(changeDelInfo.getSourceId());
+                String detail = changeDelInfo.getDetail();
+                if(detail!=null && detail.startsWith("收款")){
+                    //恢复收款记录 修改相应合同收款金额
+                    dealPayMoneyByContractMoney(money,1);
+                }
+                money.setDelFlag(0);
+                contractMoneyRepository.save(money);
+            }else if(changeDelInfo.getFunction()==4){
+                // 合同恢复
+                Contract contract = contractRepository.findOne(changeDelInfo.getSourceId());
+                contract.setStatus(changeDelInfo.getOriginal());
+                contractRepository.save(contract);
+
+            }
+        }
+
+        return null;
+    }
+
     public void saveChangeDelInfo(ChangeDelInfo changeDelInfo, int function, int type, String ip, User loginUser){
 
         changeDelInfo.setCreatTime(new Date());
@@ -1407,8 +1458,6 @@ public class ContractServiceImpl implements ContractService {
 
     }
 
-
-
     @Override
     public List<ContractMoney> findPay(String startDate, String endDate, String code) {
         List<User> sales = userRepository.findAll();