大后台更新

pom.xml

@@ -174,6 +174,8 @@
                 <default.datasource.username>trackingio</default.datasource.username>
                 <default.datasource.password>trackingio</default.datasource.password>
 
+
+
                 <office.url>
                     jdbc:mysql://track.cma5jkozme68.rds.cn-north-1.amazonaws.com.cn:3306/office?characterEncoding=utf-8
                 </office.url>
@@ -186,6 +188,7 @@
                 <tkio.username>trackingio</tkio.username>
                 <tkio.password>trackingio</tkio.password>
 
+
                 <track.url>
                     jdbc:mysql://track.cma5jkozme68.rds.cn-north-1.amazonaws.com.cn:3306/track?characterEncoding=utf-8
                 </track.url>

src/main/java/adi/service/impl/ADIAccountServiceImpl.java

@@ -129,6 +129,10 @@ public class ADIAccountServiceImpl implements ADIAccountService {
 
     @Override
     public void updateAccount(Contract contract) {
+
+        //暂时 注释改代码
+        if(true)    return ;
+
         ADIUser adiUser = findOne(contract.getEmail());
         if(null != adiUser){
             String url = u + "adi/api/user/web/update";

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

@@ -285,6 +285,14 @@ public class ContractController {
     }
 
 
+    @RequestMapping(value = "setstaus", method = RequestMethod.GET)
+    @ResponseBody
+    public ResultModel contractStatusUpdate( @PathVariable String platform,String contractId,String status) {
+
+        return ResultModel.OK(service.contractStatusUpdate(platform,contractId,status));
+    }
+
+
 
 
 }

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

@@ -38,7 +38,7 @@ public class Contract {
     private Long payMoney;
     private Long invoice;  // 开票次数
     private String invoiceMoney;  // 发票金额
-    private String createName;
+    private String createName; // 创建人NAME
     //合同类型 主套餐 or 增值套餐
     private String type;
     private Long priceName;
@@ -46,7 +46,7 @@ public class Contract {
     private Long extraFlow;
 
     private Long modifyAccount;
-    private Long createAccount;
+    private Long createAccount;// 创建人id
     private Date modifyTime;
     private Date createTime;
     private String ds;

src/main/java/common/repository/ContractRepository.java

@@ -52,8 +52,8 @@ public interface ContractRepository extends JpaRepository<Contract, Long> {
     @Query(value = "select count(*) from contract where platform = ?1",nativeQuery = true)
     BigInteger findcountContract(String platform);
 
-    @Query(value = "select new map( c.id as id, c.contractCode as contractCode ) from Contract c where c.platform = ?1")
-    Map contractCodePlatform(String platform);
+    @Query(value = "select new map( c.id as id, c.contractCode as contractCode ) from Contract c where c.platform = ?1 and c.contractCode is not null and c.contractCode <> 'null'")
+    List<Map> contractCodePlatform(String platform);
 
     @Query(value = "select * from contract where platform = ?1 and contract_code = ?2",nativeQuery = true)
     Contract findByCodePlatform(String contractCode, String platform);

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

@@ -53,7 +53,9 @@ public interface ContractService {
 
     List<TradeType> getTradeData(String platform);
 
-    Map contractCodeAll(String platform);
+    List<Map> contractCodeAll(String platform);
 
     List<Contract> findAllContract(User loginAccount, String startDate, String endDate, String platform, String contractId);
+
+    Contract contractStatusUpdate(String platform, String contractId, String status);
 }
\ No newline at end of file

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

@@ -41,6 +41,14 @@ import java.util.*;
 @Service
 public class ContractServiceImpl implements ContractService{
 
+
+    private static final Map<String,String> CONTRACT_TYPE = new HashMap(){{
+        put("0","首次签约");
+        put("1","续约");
+        put("2","合同变更");
+
+    }};
+
     @Autowired
     ContractRepository contractRepository;
     @Autowired
@@ -176,7 +184,7 @@ public class ContractServiceImpl implements ContractService{
 
         BigInteger countContract = contractRepository.findcountContract(platform);
 
-        String lastCode = "";
+        String lastCode;
 
         int codeInt = countContract.intValue();
 
@@ -185,7 +193,7 @@ public class ContractServiceImpl implements ContractService{
         } else {
             lastCode = "" + (codeInt + 1);
         }
-        return (company + "-" + platform + "-" + DateUtil.getDays2(0) + "-" + lastCode).toUpperCase();
+        return (code + "-" + platform + "-" + DateUtil.getDays2(0) + "-" + lastCode).toUpperCase();
     }
 
     @Override
@@ -273,11 +281,11 @@ public class ContractServiceImpl implements ContractService{
         }
 
         // 老的逻辑
-        String contractCode = getContractCode(resource.getMyBodyCode());
-
-        if(!contractCode.equals(resource.getContractCode())){
-            resource.setContractCode(contractCode);
-        }
+//        String contractCode = getContractCode(resource.getMyBodyCode());
+//
+//        if(!contractCode.equals(resource.getContractCode())){
+//            resource.setContractCode(contractCode);
+//        }
 
         resource.setPayMoney(0L);
         resource.setInvoice(0L);
@@ -309,16 +317,16 @@ public class ContractServiceImpl implements ContractService{
             resource.setDs(DateUtil.getBeforeDays(0));
             resource.setStatus("wait");
         }
-        Double rebat = null;
-        if(null != resource.getPriceLevel()){
-            rebat = getRebat(resource.getProduct(), resource.getPriceLevel().intValue(), resource.getMoney());
-        }else{
-            rebat = getRebat(resource.getProduct(), 0, resource.getMoney());
-        }
-
-        BigDecimal bg = new BigDecimal(rebat);
-        double f1 = bg.setScale(2, BigDecimal.ROUND_HALF_UP).doubleValue();
-        resource.setRebate(f1);
+//        Double rebat = null;
+//        if(null != resource.getPriceLevel()){
+//            rebat = getRebat(resource.getProduct(), resource.getPriceLevel().intValue(), resource.getMoney());
+//        }else{
+//            rebat = getRebat(resource.getProduct(), 0, resource.getMoney());
+//        }
+//
+//        BigDecimal bg = new BigDecimal(rebat);
+//        double f1 = bg.setScale(2, BigDecimal.ROUND_HALF_UP).doubleValue();
+//        resource.setRebate(f1);
 
         if(null != loginUser) {
             resource.setCreateAccount(loginUser.getId());
@@ -598,6 +606,24 @@ public class ContractServiceImpl implements ContractService{
     }
 
     @Override
+    public Contract contractStatusUpdate(String platform, String contractId, String status) {
+
+        if(StringUtils.isEmpty(contractId)){
+            return null;
+        }
+
+        Contract contract = contractRepository.findOne(Long.parseLong(contractId));
+
+        if(ContractStatusEnum.CANCEL.getKey().equals(status)){
+            contract.setStatus(status);
+        }else{
+            contract.setStatus(ContractStatusEnum.DELETE.getKey());
+        }
+
+        return contractRepository.save(contract);
+    }
+
+    @Override
     public Contract findOne(String code) {
 
         List<Contract> result = new ArrayList<>();
@@ -825,7 +851,7 @@ public class ContractServiceImpl implements ContractService{
     }
 
     @Override
-    public Map contractCodeAll(String platform) {
+    public List<Map> contractCodeAll(String platform) {
         return contractRepository.contractCodePlatform(platform);
     }
 

src/main/java/dic/ContractStatusEnum.java

@@ -9,7 +9,8 @@ public enum ContractStatusEnum {
     WAIT("wait","未执行"),
     EXECUTING("executing", "执行中"),
     CANCEL("cancel", "作废"),
-    END("end", "已结束");
+    END("end", "已结束"),
+    DELETE("del", "已删除");
 
     private String key;
     private String value;

src/main/java/tkio/service/impl/AccountServiceImpl.java

@@ -24,6 +24,11 @@ public class AccountServiceImpl implements AccountService {
     AccountRepository accountRepository;
     @Override
     public Account update(Contract contract) {
+
+        //暂时 注释改代码
+        if(true)    return null;
+
+
         Account account = accountRepository.findByEmail(contract.getEmail());
         String today = DateUtil.getBeforeDays(0);
         Date pubDate = DateUtil.getDate(contract.getStartDate());

src/main/java/tkio/service/impl/TkioAccountServiceImpl.java

@@ -397,10 +397,8 @@ public class TkioAccountServiceImpl implements TkioAccountService {
         re.setRemindStatus(true);
         re.setDs(DateUtil.getBeforeDays(0));
         reminderRepository.save(re);
-
-
-
         return paymentRepository.save(resource);
+        
     }
 
     @Override

src/main/java/userio/service/impl/AccountIOServiceImpl.java

@@ -25,6 +25,9 @@ public class AccountIOServiceImpl implements AccountIOService {
     IOAccountRepository accountRepository;
     @Override
     public Account update(Contract contract) {
+
+        //暂时 注释改代码
+        if(true)    return null;
         Account account = accountRepository.findByEmail(contract.getEmail());
         String today = DateUtil.getBeforeDays(0);
         Date pubDate = DateUtil.getDate(contract.getStartDate());