付款字段修改

happy-cloud-wisdom/happy-cloud-wisdom-biz/src/main/java/org/jeecg/modules/hlwpayment/entity/HlwPayment.java

@@ -48,12 +48,7 @@ public class HlwPayment implements Serializable {
     @Excel(name = "企业id", width = 15)
     @ApiModelProperty(value = "企业id")
     private java.lang.Integer companyId;
-    /**
-     * 订单id
-     */
-    @Excel(name = "订单id", width = 15)
-    @ApiModelProperty(value = "订单id")
-    private java.lang.Integer orderId;
+
     /**
      * 服务商id
      */
@@ -111,26 +106,7 @@ public class HlwPayment implements Serializable {
     @ApiModelProperty(value = "是否通过平台（0：否 1：是）")
     @Dict(dicCode = "is_through_platform")
     private java.lang.String isThroughPlatform;
-    /**
-     * 需求名称
-     */
-    @Excel(name = "需求名称", width = 15)
-    @ApiModelProperty(value = "需求名称")
-    private java.lang.String requirementName;
-    /**
-     * 需求描述
-     */
-    @Excel(name = "需求描述", width = 15)
-    @ApiModelProperty(value = "需求描述")
-    private java.lang.String requirementDescription;
-    /**
-     * 需求时间
-     */
-    @Excel(name = "需求时间", width = 15, format = "yyyy-MM-dd HH:mm:ss")
-    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
-    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-    @ApiModelProperty(value = "需求时间")
-    private java.util.Date requirmentTime;
+
     /**
      * 发票id
      */

happy-cloud-wisdom/happy-cloud-wisdom-biz/src/main/java/org/jeecg/modules/hlwpayment/entity/HlwPaymentDetail.java

@@ -145,6 +145,14 @@ public class HlwPaymentDetail implements Serializable {
     @ApiModelProperty(value = "完税id（只有支付成功才有此值）")
     private java.lang.Integer dutyPaidId;
 
+    /**
+     * 订单id
+     */
+    @Excel(name = "订单id", width = 15)
+    @ApiModelProperty(value = "订单id")
+    private java.lang.Integer orderId;
+
+
 
     @TableField(exist = false)
     @Excel(name = "接单数", width = 15)

happy-cloud-wisdom/happy-cloud-wisdom-biz/src/main/java/org/jeecg/modules/hlwpayment/mapper/xml/HlwPaymentDetailMapper.xml

@@ -259,7 +259,7 @@
 		left join hlw_payment hp on hp.id=a.payment_id
 		left join hlw_invoice hi on hi.id=hp.invoice_id
 		left join hlw_duty_paid hd on hd.id=a.duty_paid_id
-		left join hlw_order ho on ho.id=hp.order_id
+		left join hlw_order ho on ho.id=a.order_id
 		left join hlw_requirement hr on hr.id=ho.requirement_id
 		<where>
 			a.status=3