魏超 5 years ago
parent
commit
28d030fccd

+ 1
- 1
src/main/java/com/huiju/estateagents/redpack/controller/TaOrgOrderController.java View File

99
      */
99
      */
100
     @RequestMapping(value = "/channel/taOrgOrder/rechargeOrderExport")
100
     @RequestMapping(value = "/channel/taOrgOrder/rechargeOrderExport")
101
     public void rechargeOrderExport(@RequestParam(value = "tradeNo", required = false) String tradeNo,
101
     public void rechargeOrderExport(@RequestParam(value = "tradeNo", required = false) String tradeNo,
102
-                                                   @RequestParam(value = "isOffline", required = false) Integer isOffline,
102
+                                                   @RequestParam(value = "isOffline", required = false) Boolean isOffline,
103
                                                    @RequestParam(value = "tradingStatus", required = false) String tradingStatus,
103
                                                    @RequestParam(value = "tradingStatus", required = false) String tradingStatus,
104
                                                    @RequestParam(value = "miniAppName", required = false) String miniAppName,
104
                                                    @RequestParam(value = "miniAppName", required = false) String miniAppName,
105
                                                    @RequestParam(value = "startDate", required = false) String startDate,
105
                                                    @RequestParam(value = "startDate", required = false) String startDate,

+ 1
- 1
src/main/java/com/huiju/estateagents/redpack/mapper/TaOrgOrderMapper.java View File

73
      */
73
      */
74
     List<RechargeOrder> rechargeListByConditionExport(@Param("itemType") String itemType,
74
     List<RechargeOrder> rechargeListByConditionExport(@Param("itemType") String itemType,
75
                                                           @Param("tradeNo") String tradeNo,
75
                                                           @Param("tradeNo") String tradeNo,
76
-                                                          @Param("isOffline") Integer isOffline,
76
+                                                          @Param("isOffline") Boolean isOffline,
77
                                                           @Param("tradingStatus") String tradingStatus,
77
                                                           @Param("tradingStatus") String tradingStatus,
78
                                                           @Param("startDate") String startDate,
78
                                                           @Param("startDate") String startDate,
79
                                                           @Param("endDate") String endDate,
79
                                                           @Param("endDate") String endDate,

+ 1
- 1
src/main/java/com/huiju/estateagents/redpack/service/ITaOrgOrderService.java View File

59
      *
59
      *
60
      * @return
60
      * @return
61
      */
61
      */
62
-    List<RechargeOrder> rechargeListByConditionExport(String itemType, String tradeNo, Integer isOffline, String tradingStatus, String startDate, String endDate, String miniAppName, Integer orgId);
62
+    List<RechargeOrder> rechargeListByConditionExport(String itemType, String tradeNo, Boolean isOffline, String tradingStatus, String startDate, String endDate, String miniAppName, Integer orgId);
63
 
63
 
64
     /**
64
     /**
65
      * 消费订单列表导出
65
      * 消费订单列表导出

+ 1
- 1
src/main/java/com/huiju/estateagents/redpack/service/impl/TaOrgOrderServiceImpl.java View File

132
     }
132
     }
133
 
133
 
134
     @Override
134
     @Override
135
-    public List<RechargeOrder> rechargeListByConditionExport(String itemType, String tradeNo, Integer isOffline, String tradingStatus, String startDate, String endDate, String miniAppName, Integer orgId) {
135
+    public List<RechargeOrder> rechargeListByConditionExport(String itemType, String tradeNo, Boolean isOffline, String tradingStatus, String startDate, String endDate, String miniAppName, Integer orgId) {
136
         List<RechargeOrder> result = taOrgOrderMapper.rechargeListByConditionExport(itemType, tradeNo, isOffline, tradingStatus, startDate, endDate, miniAppName, orgId);
136
         List<RechargeOrder> result = taOrgOrderMapper.rechargeListByConditionExport(itemType, tradeNo, isOffline, tradingStatus, startDate, endDate, miniAppName, orgId);
137
         return result;
137
         return result;
138
     }
138
     }

+ 1
- 1
src/main/resources/mapper/redpack/TaOrgOrderMapper.xml View File

126
         <if test="tradeNo != null and tradeNo != ''">
126
         <if test="tradeNo != null and tradeNo != ''">
127
             and t.trade_no like concat('%', #{tradeNo}, '%')
127
             and t.trade_no like concat('%', #{tradeNo}, '%')
128
         </if>
128
         </if>
129
-        <if test="isOffline != null or isOffline == 0">
129
+        <if test="isOffline != null">
130
             and t.is_offline = #{isOffline}
130
             and t.is_offline = #{isOffline}
131
         </if>
131
         </if>
132
         <if test="tradingStatus != null ">
132
         <if test="tradingStatus != null ">