Explorar o código

支付详情修改

Signed-off-by: anderx <312518615@qq.com>
anderx %!s(int64=5) %!d(string=hai) anos
pai
achega
844284859f

+ 5 - 4
src/main/java/com/goafanti/common/mapper/TOrderPaymentMapper.xml

@@ -458,9 +458,10 @@
     where id = #{id,jdbcType=INTEGER}
     where id = #{id,jdbcType=INTEGER}
   </update>
   </update>
   <select id="selectByidGetDetails" resultType="com.goafanti.organization.bo.outOrderPayment">
   <select id="selectByidGetDetails" resultType="com.goafanti.organization.bo.outOrderPayment">
-	 select a.id,a.tid,a.node_id nodeId,a.payment_type paymentType,a.company_name companyName,a.quantity,
-	  a.payment_status paymentStatus, a.status,a.payment_amount paymentAmount,a.remarks ,
-	  b.quantity NodeQuantity,b.party_amount NodePartyAmount,b.total_amount NodeTotalAmount
-	 from t_order_payment a left join payment_node b on a.node_id=b.id where a.id= #{id}
+select a.id,a.tid,a.node_id nodeId,a.payment_type paymentType,a.company_name companyName,a.quantity,
+	  a.payment_status paymentStatus, a.status,a.payment_amount paymentAmount,a.remarks , b.quantity NodeQuantity,
+	  b.party_amount NodePartyAmount,b.total_amount NodeTotalAmount,d.finance_name financeName 
+	 from t_order_payment a left join payment_node b on a.node_id=b.id
+	 left join t_order_task c on b.tid=c.id left join t_order_mid d on c.order_no=d.order_no where a.id= #{id}
   </select>
   </select>
 </mapper>
 </mapper>

+ 20 - 0
src/main/java/com/goafanti/organization/bo/outOrderPayment.java

@@ -8,6 +8,8 @@ public class outOrderPayment extends TOrderPayment{
 	 private Integer NodeQuantity;
 	 private Integer NodeQuantity;
 	 private BigDecimal NodePartyAmount;
 	 private BigDecimal NodePartyAmount;
 	 private BigDecimal NodeTotalAmount;
 	 private BigDecimal NodeTotalAmount;
+	 
+	 private String financeName;
 	public Integer getNodeQuantity() {
 	public Integer getNodeQuantity() {
 		return NodeQuantity;
 		return NodeQuantity;
 	}
 	}
@@ -26,6 +28,24 @@ public class outOrderPayment extends TOrderPayment{
 	public void setNodeTotalAmount(BigDecimal nodeTotalAmount) {
 	public void setNodeTotalAmount(BigDecimal nodeTotalAmount) {
 		NodeTotalAmount = nodeTotalAmount;
 		NodeTotalAmount = nodeTotalAmount;
 	}
 	}
+	public String getFinanceName() {
+		return financeName;
+	}
+	public void setFinanceName(String financeName) {
+		this.financeName = financeName;
+	}
+	
+	/*public String getAuditInformation() {
+		if (getStatus()==null) return "";
+		else if (getStatus()==0) return "待"+financeName+"审核";
+		else if (getStatus()==1) return "待重新提交";
+		else if (getStatus()==2) return "待"+financeName+"支付";
+		else if (getStatus()==3) return "已完成支付";
+		return "";
+	}*/
+
+
+
 	 
 	 
 	 
 	 
 }
 }

+ 0 - 1
src/main/java/com/goafanti/organization/controller/ThirdPartyCompanyApiController.java

@@ -10,7 +10,6 @@ import org.springframework.web.bind.annotation.RestController;
 import com.goafanti.common.bo.Result;
 import com.goafanti.common.bo.Result;
 import com.goafanti.common.constant.ErrorConstants;
 import com.goafanti.common.constant.ErrorConstants;
 import com.goafanti.common.controller.BaseApiController;
 import com.goafanti.common.controller.BaseApiController;
-import com.goafanti.common.model.PaymentNode;
 import com.goafanti.common.model.TOrderPayment;
 import com.goafanti.common.model.TOrderPayment;
 import com.goafanti.common.model.ThirdPartyCompany;
 import com.goafanti.common.model.ThirdPartyCompany;
 import com.goafanti.common.utils.StringUtils;
 import com.goafanti.common.utils.StringUtils;