魏超 před 5 roky
rodič
revize
28d030fccd

+ 1
- 1
src/main/java/com/huiju/estateagents/redpack/controller/TaOrgOrderController.java Zobrazit soubor

@@ -99,7 +99,7 @@ public class TaOrgOrderController extends BaseController {
99 99
      */
100 100
     @RequestMapping(value = "/channel/taOrgOrder/rechargeOrderExport")
101 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 103
                                                    @RequestParam(value = "tradingStatus", required = false) String tradingStatus,
104 104
                                                    @RequestParam(value = "miniAppName", required = false) String miniAppName,
105 105
                                                    @RequestParam(value = "startDate", required = false) String startDate,

+ 1
- 1
src/main/java/com/huiju/estateagents/redpack/mapper/TaOrgOrderMapper.java Zobrazit soubor

@@ -73,7 +73,7 @@ public interface TaOrgOrderMapper extends BaseMapper<TaOrgOrder> {
73 73
      */
74 74
     List<RechargeOrder> rechargeListByConditionExport(@Param("itemType") String itemType,
75 75
                                                           @Param("tradeNo") String tradeNo,
76
-                                                          @Param("isOffline") Integer isOffline,
76
+                                                          @Param("isOffline") Boolean isOffline,
77 77
                                                           @Param("tradingStatus") String tradingStatus,
78 78
                                                           @Param("startDate") String startDate,
79 79
                                                           @Param("endDate") String endDate,

+ 1
- 1
src/main/java/com/huiju/estateagents/redpack/service/ITaOrgOrderService.java Zobrazit soubor

@@ -59,7 +59,7 @@ public interface ITaOrgOrderService extends IService<TaOrgOrder> {
59 59
      *
60 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 Zobrazit soubor

@@ -132,7 +132,7 @@ public class TaOrgOrderServiceImpl extends ServiceImpl<TaOrgOrderMapper, TaOrgOr
132 132
     }
133 133
 
134 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 136
         List<RechargeOrder> result = taOrgOrderMapper.rechargeListByConditionExport(itemType, tradeNo, isOffline, tradingStatus, startDate, endDate, miniAppName, orgId);
137 137
         return result;
138 138
     }

+ 1
- 1
src/main/resources/mapper/redpack/TaOrgOrderMapper.xml Zobrazit soubor

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