Browse Source

财务新增已付成本

Signed-off-by: anderx <312518615@qq.com>
anderx 5 years ago
parent
commit
ba68b716c0

+ 4 - 1
src/main/java/com/goafanti/common/dao/FinancialPaymentMapper.java

@@ -5,6 +5,7 @@ import com.goafanti.common.model.FinancialPaymentExample;
 import com.goafanti.organization.bo.NoticeInformationBo;
 import com.goafanti.organization.bo.outFinancialPayment;
 
+import java.math.BigDecimal;
 import java.util.List;
 import org.apache.ibatis.annotations.Param;
 
@@ -80,6 +81,8 @@ public interface FinancialPaymentMapper {
 	List<outFinancialPayment> selectByPid(Integer id);
 
 
-
 	NoticeInformationBo selectBypidGetNotice(Integer pid);
+
+	void updateOrderCost(@Param("pid")Integer pid, @Param("partyAmount")BigDecimal partyAmount);
+	
 }

+ 5 - 0
src/main/java/com/goafanti/common/mapper/FinancialPaymentMapper.xml

@@ -294,4 +294,9 @@
 	left join admin sa on d.salesman_id=sa.id left join admin fa on d.finance_id=fa.id
 	where b.id= #{pid}
   </select>
+  
+  <select id="updateOrderCost">
+  update t_order_mid x ,(select a.id,b.order_no from t_order_payment a left join t_order_task b on a.tid=b.id 
+	where a.id=#{pid})y set x.cost_amount= x.cost_amount+#{partyAmount}	where x.order_no=y.order_no
+  </select>
 </mapper>

+ 1 - 1
src/main/java/com/goafanti/common/mapper/TOrderNewMapper.xml

@@ -1131,7 +1131,7 @@
   </select>
   <!-- 财务专员查看需要待收款的数据 -->
   <select id="financeList" parameterType="Map" resultType="com.goafanti.order.bo.OrderListBo">
- select o.order_no as orderNo, o.sign_time as signTime, u.nickname as buyerName, o.order_status as orderStatus,a.finance_name financeName,
+ select o.order_no as orderNo, o.sign_time as signTime, u.nickname as buyerName, o.order_status as orderStatus,a.finance_name financeName,a.cost_amount costAmount,
 	o.process_status as processStatus, o.settlement_amount as actuallyTotalAmount, o.contract_no as contractNo, o.approval, o.back_status backStatus,
 	a.salesman_name as sellerName, o.salesman_id as sellerId, o.buyer_id as buyerId, o.liquidation_status as liquidationStatus ,too.amount outsourceAmount,
 	o.first_amount as signFirstPayment, o.total_amount as signTotalAmount, date_format(o.create_time, '%Y-%m-%d %H:%i:%s') as createTime,

+ 1 - 1
src/main/java/com/goafanti/common/task/ReleaseUserTask.java

@@ -9,7 +9,6 @@ import java.util.UUID;
 import javax.annotation.Resource;
 import javax.mail.MessagingException;
 
-import org.apache.log4j.LogSF;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.scheduling.annotation.Scheduled;
 import org.springframework.stereotype.Component;
@@ -29,6 +28,7 @@ import com.goafanti.common.utils.StringUtils;
 import com.goafanti.customer.bo.LockingReleaseBo;
 import com.goafanti.customer.service.CustomerService;
 import com.goafanti.user.service.UserService;
+
 @Component
 @Controller
 public class ReleaseUserTask {

+ 8 - 0
src/main/java/com/goafanti/order/bo/OrderListBo.java

@@ -96,6 +96,8 @@ public class OrderListBo {
 	private String orderReceivables;
 	/**欠款 */
 	private String  orderArrears;
+	/**已付成本*/
+	private String  costAmount;
 	
 	public String getFinalReceivables() {
 		return finalReceivables;
@@ -370,4 +372,10 @@ public class OrderListBo {
 	public void setOrderArrears(String orderArrears) {
 		this.orderArrears = orderArrears;
 	}
+	public String getCostAmount() {
+		return costAmount;
+	}
+	public void setCostAmount(String costAmount) {
+		this.costAmount = costAmount;
+	}
 }

+ 1 - 0
src/main/java/com/goafanti/organization/service/impl/ThirdPartyCompanyServiceImpl.java

@@ -194,6 +194,7 @@ public class ThirdPartyCompanyServiceImpl extends  BaseMybatisDao<ThirdPartyComp
 	@Override
 	public int addfinancialPayment(InuptFinancialPayment f) {
 		f.setPaymentTime(DateUtils.StringToDate(f.getPaymentTimes(), AFTConstants.YYYYMMDD));
+		financialPaymentMapper.updateOrderCost(f.getPid(),f.getPartyAmount());
 		NoticeInformationBo ni=financialPaymentMapper.selectBypidGetNotice(f.getPid());
 		AdminListBo a =adminMapper.getDeptNameByAid(TokenManager.getAdminId());
 		addNoticAndSendEmail(ni,a,NoticeStatus.PAYMENT_COMPLETE.getCode());