anderx лет назад: 6
Родитель
Сommit
b3a918aa1a

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

@@ -388,7 +388,7 @@
   </select>
   <select id="selectReceivablesList" parameterType="java.lang.String" resultType="com.goafanti.order.bo.ReceivablesListBo">
   	select a.id,a.order_no orderNo,b.contract_no contractNo,a.corporate_name corporateName,c.nickname,b.total_amount totalAmount,d.name depName,a.status ,
-	a.amount,date_format(a.receivables_time, '%Y-%m-%d')receivablesTimes,date_format(a.create_time, '%Y-%m-%d %H:%i:%S')createTimes,a.remarks
+	a.financial_pay_no financialPayNo,a.amount,date_format(a.receivables_time, '%Y-%m-%d')receivablesTimes,date_format(a.create_time, '%Y-%m-%d %H:%i:%S')createTimes,a.remarks
 	from temporary_receivables a left join t_order_new b on a.order_no=b.order_no left join user c on b.buyer_id=c.id left join department d on b.order_dep=d.id
 	left join admin e on b.salesman_id=e.id 
 	where 1=1

+ 7 - 0
src/main/java/com/goafanti/order/bo/ReceivablesListBo.java

@@ -12,6 +12,7 @@ public class ReceivablesListBo {
 	private String amount;
 	private String receivablesTimes;
 	private String createTimes;
+	private String financialPayNo;
 	private String remarks;
 	public String getOrderNo() {
 		return orderNo;
@@ -85,6 +86,12 @@ public class ReceivablesListBo {
 	public void setId(Integer id) {
 		this.id = id;
 	}
+	public String getFinancialPayNo() {
+		return financialPayNo;
+	}
+	public void setFinancialPayNo(String financialPayNo) {
+		this.financialPayNo = financialPayNo;
+	}
 	
 	
 

+ 8 - 1
src/main/java/com/goafanti/order/service/impl/OrderReceivablesServiceImpl.java

@@ -148,6 +148,12 @@ public class OrderReceivablesServiceImpl extends BaseMybatisDao<TemporaryReceiva
 			BigDecimal bill = tOrderBillNewMapper.getAmountByOid(tr.getOrderNo());
 			//获取总金额
 			TOrderNew t=tOrderNewMapper.selectByPrimaryKey(tr.getOrderNo());
+			//如果订单不是自己的则也不允许收款
+			if(t==null||t.getOrderNo()==null||!t.getFinanceId().equals(TokenManager.getAdminId())) {
+				tr.setStatus(2);
+				temporaryReceivablesMapper.updateByPrimaryKeySelective(tr);
+				continue;
+			}
 			//计算收款结果
 			BigDecimal bd = bill.add(tr.getAmount().abs());
 			
@@ -223,6 +229,7 @@ public class OrderReceivablesServiceImpl extends BaseMybatisDao<TemporaryReceiva
 			tbn.setDeleteSign((new Byte("0")));
 			tbn.setFinancialPayTime(tr.getReceivablesTime());
 			tbn.setFinancialPayNo(tr.getFinancialPayNo());
+			tbn.setRemarks(tr.getRemarks());
 			//修改订单结算金额和结算状态
 			//如果已经首付并且流程状态是没有派给咨询师的修改流程状态为4
 			TOrderNew orderNew = new TOrderNew();
@@ -352,7 +359,7 @@ public class OrderReceivablesServiceImpl extends BaseMybatisDao<TemporaryReceiva
 							trb.setCorporateName(getCellValue(cell));
 							break;
 						case 3:
-							trb.setAmount(new BigDecimal(getCellValue(cell)));
+							trb.setAmount(new BigDecimal((null==getCellValue(cell)?"0":getCellValue(cell))));
 							break;
 						case 4:
 							trb.setReceivablesTime(DateUtils.StringToDate(getCellValue(cell), AFTConstants.YYYYMMDD));