列表问题处理

haoban-manage3-api/src/main/java/com/gic/haoban/manage/api/dto/qdto/licence/LicenceOrderPageQDTO.java

@@ -62,6 +62,19 @@ public class LicenceOrderPageQDTO extends BasePageInfo implements Serializable
      * 支付方式 1在线支付 2对公转账
      */
     private Integer payType;
+    /**
+     * gic商户查询id
+     */
+    private String enterpriseIdParam;
+
+    public String getEnterpriseIdParam() {
+        return enterpriseIdParam;
+    }
+
+    public void setEnterpriseIdParam(String enterpriseIdParam) {
+        this.enterpriseIdParam = enterpriseIdParam;
+    }
+
     public Integer getPayType() {
         return payType;
     }

haoban-manage3-operation-web/src/main/java/com/gic/haoban/manage/web/qo/licence/LicenceOrderPageQO.java

@@ -53,9 +53,9 @@ public class LicenceOrderPageQO extends BasePageInfo implements Serializable {
      */
     private Integer payType;
     /**
-     * gic商户Id
+     * gic商户查询id
      */
-    private String enterpriseId;
+    private String enterpriseIdParam;
     /**
      * 微信订单id
      */

haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/service/licence/impl/LicenceOrderServiceImpl.java

@@ -222,7 +222,7 @@ public class LicenceOrderServiceImpl implements LicenceOrderService {
         for (TabHaobanLicenceOrder dto : licenceOrderPage){
             if (dto.getExpireTime().before(new Date()) && dto.getOrderStatus() == 0){
                 dto.setOrderStatus(3);
-                updateLicenceOrderType(dto.getOrderId(), 3,qdto.getEnterpriseId(), qdto.getWxEnterpriseId(), qdto.getCreatorName(),1);
+                updateLicenceOrderType(dto.getOrderId(), 3,dto.getEnterpriseId(), dto.getWxEnterpriseId(), "系统",1);
             }
         }
         return PageHelperUtils.changePageHelperToCurrentPage(licenceOrderPage, LicenceOrderPageDTO.class);

haoban-manage3-service/src/main/resources/mapper/licence/TabHaobanLicenceOrderMapper.xml

@@ -213,7 +213,7 @@
         <include refid="Base_Column_List"/>
         FROM tab_haoban_licence_order
         WHERE  delete_flag = 0
-        <if test="transactionId != null and transactionId !='' ">
+        <if test="orderNumber != null and orderNumber !='' ">
             and order_number=#{orderNumber}
         </if>
         <if test="orderStatus != null">
@@ -231,13 +231,19 @@
         <if test="endTime != null and endTime !='' ">
             and create_time <![CDATA[ <= ]]> #{endTime}
         </if>
+        <if test="enterpriseIdParam != null and enterpriseIdParam !='' ">
+            and enterprise_id=#{enterpriseIdParam}
+        </if>
+        <if test="payType != null  ">
+            and pay_type=#{payType}
+        </if>
         order by create_time desc
     </select>
 
     <update id="saveTransactionCode">
         UPDATE tab_haoban_licence_order
         SET
-        <if test="transactionCode != null">
+        <if test="orderNumber != null">
             order_number = #{orderNumber},
         </if>
         <if test="prepayId != null">