Merge remote-tracking branch 'origin/dev' into dev

applications/document/document-server/src/main/java/com/usoftchina/saas/document/service/impl/CustomerServiceImpl.java

@@ -213,8 +213,9 @@ public class CustomerServiceImpl extends CommonBaseServiceImpl<CustomerMapper, C
 
                 //限制关联单据不可修改金额
                 Customer customer1 = getMapper().selectByPrimaryKey(customer.getId());
-                if (customer.getCu_beginaramount() != customer1.getCu_beginaramount() ||
-                        customer.getCu_beginprerecamount() != customer1.getCu_beginprerecamount()){
+                if (customer.getCu_beginaramount().doubleValue() != customer1.getCu_beginaramount().doubleValue() ||
+                        customer.getCu_beginprerecamount().doubleValue() != customer1.getCu_beginprerecamount().doubleValue() ||
+                        customer1.getCu_begindate().compareTo(customer.getCu_begindate()) != 0){
                     throw new BizException(BizExceptionCode.BIZ_RELUPDATE_AMOUNT);
                 }
             }

applications/document/document-server/src/main/java/com/usoftchina/saas/document/service/impl/VendorServiceImpl.java

@@ -198,8 +198,9 @@ public class VendorServiceImpl extends CommonBaseServiceImpl<VendorMapper, Vendo
             if(!StringUtils.isEmpty(result)){
                 //限制关联单据不可修改金额
                 Vendor vendor = getMapper().selectByPrimaryKey(main.getId());
-                if (vendor.getVe_beginapamount() != main.getVe_beginapamount() ||
-                        vendor.getVe_beginprepayamount() != main.getVe_beginprepayamount()){
+                if (vendor.getVe_beginapamount().doubleValue() != main.getVe_beginapamount().doubleValue() ||
+                        vendor.getVe_beginprepayamount().doubleValue() != main.getVe_beginprepayamount().doubleValue() ||
+                        vendor.getVe_begindate().compareTo(main.getVe_begindate()) != 0){
                     throw new BizException(BizExceptionCode.BIZ_RELUPDATE_AMOUNT);
                 }
             }
@@ -313,7 +314,6 @@ public class VendorServiceImpl extends CommonBaseServiceImpl<VendorMapper, Vendo
         }
     }
 
-
     /**
      * 关闭
      * @param id

applications/money/money-server/src/main/java/com/usoftchina/saas/money/service/impl/OthreceiptsServiceImpl.java

@@ -162,8 +162,8 @@ public class OthreceiptsServiceImpl extends CommonBaseServiceImpl<OthreceiptsMap
             Customer customer = new Customer();
             customer.setId(Long.valueOf(othreceipts.getOr_custid()));
             customer.setCu_preamount(preamount);
-            customer.setCu_recamount(recamount - or_amount);
-            customer.setCu_leftamount(beginapamount - beginprepayamount + recamount - or_amount - preamount);
+            customer.setCu_recamount(recamount + or_amount);
+            customer.setCu_leftamount(beginapamount - beginprepayamount + recamount + or_amount - preamount);
             recbalanceMapper.updateCustomerByPrimaryKeySelective(customer);
 
             //插入subledger中间表
@@ -218,6 +218,7 @@ public class OthreceiptsServiceImpl extends CommonBaseServiceImpl<OthreceiptsMap
         othreceipts = othreceiptsMapper.selectByPrimaryKey(id);
         banksubledgerMapper.deleteByPrimaryKey(othreceipts.getOr_code(), "其他收入单");
 
+
         //更新资金
         Double amount = banksubledgerMapper.selectThisamount(othreceipts.getOr_bankcode());
         List<Othreceiptsdetail> othreceiptsdetailList = othreceiptsdetailMapper.selectByPrimaryKey(id);
@@ -260,7 +261,7 @@ public class OthreceiptsServiceImpl extends CommonBaseServiceImpl<OthreceiptsMap
             customer.setId(Long.valueOf(othreceipts.getOr_custid()));
             customer.setCu_preamount(preamount);
             customer.setCu_recamount(recamount - or_amount);
-            customer.setCu_leftamount(beginapamount + beginprepayamount - recamount + or_amount + preamount);
+            customer.setCu_leftamount(beginapamount + beginprepayamount + recamount - or_amount - preamount);
             recbalanceMapper.updateCustomerByPrimaryKeySelective(customer);
             subledgerMapper.deleteByPrimaryKey(othreceipts.getOr_code(), "其他收入单");
         }