Browse Source

端口修改,Money模块报错处理

guq 7 years ago
parent
commit
bd41ec64a8
14 changed files with 22 additions and 22 deletions
  1. 1 1
      applications/commons/commons-server/src/main/resources/application.yml
  2. 1 1
      applications/money/money-server/src/main/java/com/usoftchina/saas/money/mapper/BanksubledgerMapper.java
  3. 2 0
      applications/money/money-server/src/main/java/com/usoftchina/saas/money/mapper/PaybalanceMapper.java
  4. 1 1
      applications/money/money-server/src/main/java/com/usoftchina/saas/money/mapper/RecbalanceMapper.java
  5. 2 0
      applications/money/money-server/src/main/java/com/usoftchina/saas/money/mapper/VerificationMapper.java
  6. 2 0
      applications/money/money-server/src/main/java/com/usoftchina/saas/money/mapper/VerificationdetMapper.java
  7. 1 1
      applications/money/money-server/src/main/java/com/usoftchina/saas/money/mapper/VerificationdetailMapper.java
  8. 2 0
      applications/money/money-server/src/main/java/com/usoftchina/saas/money/po/Banksubledger.java
  9. 2 2
      applications/money/money-server/src/main/java/com/usoftchina/saas/money/po/Paybalance.java
  10. 0 4
      applications/money/money-server/src/main/java/com/usoftchina/saas/money/po/Recbalance.java
  11. 2 2
      applications/money/money-server/src/main/java/com/usoftchina/saas/money/po/Recbalancedet.java
  12. 0 5
      applications/money/money-server/src/main/java/com/usoftchina/saas/money/po/Verification.java
  13. 3 3
      applications/money/money-server/src/main/resources/application.yml
  14. 3 2
      applications/purchase/purchase-server/src/main/java/com/usoftchina/saas/purchase/service/impl/PurchaseServiceImpl.java

+ 1 - 1
applications/commons/commons-server/src/main/resources/application.yml

@@ -47,7 +47,7 @@ eureka:
     serviceUrl:
       defaultZone: http://${spring.security.user.name}:${spring.security.user.password}@192.168.0.181:8510/eureka/
 server:
-  port: 8920
+  port: 8900
   tomcat:
     uri-encoding: UTF-8
 info:

+ 1 - 1
applications/money/money-server/src/main/java/com/usoftchina/saas/money/mapper/BanksubledgerMapper.java

@@ -19,7 +19,7 @@ public interface BanksubledgerMapper extends CommonBaseMapper<Banksubledger> {
 
     int deleteByPrimaryKey(Integer bl_id);
 
-    Long insert(Banksubledger record);
+/*    Long insert(Banksubledger record);*/
 
     int insertSelective(Banksubledger record);
 

+ 2 - 0
applications/money/money-server/src/main/java/com/usoftchina/saas/money/mapper/PaybalanceMapper.java

@@ -11,7 +11,9 @@ public interface PaybalanceMapper extends CommonBaseMapper<Paybalance> {
 
     int deleteByPrimaryKey(Integer pb_id);
 
+/*
     Long insert(Paybalance record);
+*/
 
     int insertSelective(Paybalance record);
 

+ 1 - 1
applications/money/money-server/src/main/java/com/usoftchina/saas/money/mapper/RecbalanceMapper.java

@@ -21,7 +21,7 @@ public interface RecbalanceMapper extends CommonBaseMapper<Recbalance> {
 
     int deleteByPrimaryKey(Integer rb_id);
 
-    Long insert(Recbalance record);
+/*    Long insert(Recbalance record);*/
 
     int insertSelective(Recbalance record);
 

+ 2 - 0
applications/money/money-server/src/main/java/com/usoftchina/saas/money/mapper/VerificationMapper.java

@@ -16,8 +16,10 @@ public interface VerificationMapper extends CommonBaseMapper<Verification> {
     int deleteByExample(VerificationExample example);
 
     int deleteByPrimaryKey(Integer vc_id);
+/*
 
     Long insert(Verification record);
+*/
 
     int insertSelective(Verification record);
 

+ 2 - 0
applications/money/money-server/src/main/java/com/usoftchina/saas/money/mapper/VerificationdetMapper.java

@@ -17,7 +17,9 @@ public interface VerificationdetMapper extends CommonBaseMapper<Verificationdet>
 
     int deleteByPrimaryKey(Integer vd_id);
 
+/*
     Long insert(Verificationdet record);
+*/
 
     int insertSelective(Verificationdet record);
 

+ 1 - 1
applications/money/money-server/src/main/java/com/usoftchina/saas/money/mapper/VerificationdetailMapper.java

@@ -18,7 +18,7 @@ public interface VerificationdetailMapper extends CommonBaseMapper<Verificationd
 
     int deleteByPrimaryKey(Integer vcd_id);
 
-    Long insert(Verificationdetail record);
+ /*   Long insert(Verificationdetail record);*/
 
     int insertSelective(Verificationdetail record);
 

+ 2 - 0
applications/money/money-server/src/main/java/com/usoftchina/saas/money/po/Banksubledger.java

@@ -172,10 +172,12 @@ public class Banksubledger extends CommonBaseEntity implements Serializable {
 
     }
 
+/*
     @Override
     public long getCompanyId() {
         return 0;
     }
+*/
 
     @Override
     public void setCompanyId(long companyId) {

+ 2 - 2
applications/money/money-server/src/main/java/com/usoftchina/saas/money/po/Paybalance.java

@@ -263,11 +263,11 @@ public class Paybalance extends CommonBaseEntity implements Serializable {
 
     }
 
-    @Override
+  /*  @Override
     public long getCompanyId() {
         return 0;
     }
-
+*/
     @Override
     public void setCompanyId(long companyId) {
 

+ 0 - 4
applications/money/money-server/src/main/java/com/usoftchina/saas/money/po/Recbalance.java

@@ -263,10 +263,6 @@ public class Recbalance extends CommonBaseEntity implements Serializable {
 
     }
 
-    @Override
-    public long getCompanyId() {
-        return 0;
-    }
 
     @Override
     public void setCompanyId(long companyId) {

+ 2 - 2
applications/money/money-server/src/main/java/com/usoftchina/saas/money/po/Recbalancedet.java

@@ -182,11 +182,11 @@ public class Recbalancedet extends CommonBaseEntity implements Serializable{
     public void setUpdaterId(long updaterId) {
 
     }
-
+/*
     @Override
     public long getCompanyId() {
         return 0;
-    }
+    }*/
 
     @Override
     public void setCompanyId(long companyId) {

+ 0 - 5
applications/money/money-server/src/main/java/com/usoftchina/saas/money/po/Verification.java

@@ -313,11 +313,6 @@ public class Verification extends CommonBaseEntity implements Serializable {
 
     }
 
-    @Override
-    public long getCompanyId() {
-        return 0;
-    }
-
     @Override
     public void setCompanyId(long companyId) {
 

+ 3 - 3
applications/money/money-server/src/main/resources/application.yml

@@ -22,8 +22,8 @@ spring:
     host: 192.168.0.176
     port: 5672
     virtual-host: dev
-    password: saas
-    username: select123***
+    username: saas
+    password: select123***
   zipkin:
     sender:
       type: rabbit
@@ -46,7 +46,7 @@ eureka:
     serviceUrl:
       defaultZone: http://${spring.security.user.name}:${spring.security.user.password}@192.168.0.181:8510/eureka/
 server:
-  port: 8920
+  port: 8880
   tomcat:
     uri-encoding: UTF-8
 info:

+ 3 - 2
applications/purchase/purchase-server/src/main/java/com/usoftchina/saas/purchase/service/impl/PurchaseServiceImpl.java

@@ -197,7 +197,7 @@ public class PurchaseServiceImpl extends CommonBaseServiceImpl<PurchaseMapper, P
                 baseDTO = saveFormData(formData);
                 id = baseDTO.getId();
             }
-            singleAudit(id);
+            baseDTO = singleAudit(id);
         }
         return baseDTO;
     }
@@ -400,7 +400,7 @@ public class PurchaseServiceImpl extends CommonBaseServiceImpl<PurchaseMapper, P
         return Result.success();
     }
 
-    private void singleAudit(Long id) {
+    private DocBaseDTO singleAudit(Long id) {
         Purchase purchase = new Purchase();
         //生成更新对象
         purchase.setId(id);
@@ -415,6 +415,7 @@ public class PurchaseServiceImpl extends CommonBaseServiceImpl<PurchaseMapper, P
         DocBaseDTO docBaseDTO = getBaseDTOById(id);
         //日志
         messageLogService.audit(docBaseDTO);
+        return docBaseDTO;
     }
 
     private void singleUnAudit(Long id) {