Merge remote-tracking branch 'origin/dev' into dev

src/main/java/com/huiju/estateagents/redpack/controller/TaOrgOrderController.java

@@ -162,6 +162,7 @@ public class TaOrgOrderController extends BaseController {
                                    @RequestParam(value = "endDate", required = false) String endDate,
                                    @RequestParam(value = "orderType", required = false) String orderType,
                                    @RequestParam(value = "orgId", required = false) Integer orgId,
+                                   @RequestParam(value = "auditStatus", required = false) String auditStatus,
                                    HttpServletRequest request, HttpServletResponse response) throws IOException {
         response.setContentType("application/octet-stream");
         response.setCharacterEncoding("utf-8");
@@ -171,7 +172,7 @@ public class TaOrgOrderController extends BaseController {
         WriteSheet writeSheet = EasyExcel.writerSheet("活动统计").build();
 
         // 设置 sheet, 同一个sheet只需要设置一次
-        List<RefundOrder> data = iTaOrgOrderService.refundListByConditionExport(orderType, tradeNo, startDate, endDate, miniAppName, orgId);
+        List<RefundOrder> data = iTaOrgOrderService.refundListByConditionExport(orderType, tradeNo, startDate, endDate, miniAppName, orgId, auditStatus);
         excelWriter.write(data, writeSheet);
         // finish 会帮忙关闭流
         excelWriter.finish();

src/main/java/com/huiju/estateagents/redpack/mapper/TaOrgOrderMapper.java

@@ -71,7 +71,7 @@ public interface TaOrgOrderMapper extends BaseMapper<TaOrgOrder> {
      *
      * @return
      */
-    List<RechargeOrder> orderListByRechargeOrRefundExport(@Param("itemType") String itemType,
+    List<RechargeOrder> rechargeListByConditionExport(@Param("itemType") String itemType,
                                                           @Param("tradeNo") String tradeNo,
                                                           @Param("isOffline") Integer isOffline,
                                                           @Param("tradingStatus") String tradingStatus,
@@ -104,7 +104,8 @@ public interface TaOrgOrderMapper extends BaseMapper<TaOrgOrder> {
                                               @Param("startDate") String startDate,
                                               @Param("endDate") String endDate,
                                               @Param("miniAppName") String miniAppName,
-                                              @Param("orgId") Integer orgId);
+                                              @Param("orgId") Integer orgId,
+                                              @Param("auditStatus") String auditStatus);
 
     /**
      * 获取充值订单列表

src/main/java/com/huiju/estateagents/redpack/service/ITaOrgOrderService.java

@@ -73,7 +73,7 @@ public interface ITaOrgOrderService extends IService<TaOrgOrder> {
      *
      * @return
      */
-    List<RefundOrder> refundListByConditionExport(String itemType, String tradeNo, String startDate, String endDate, String miniAppName, Integer orgId);
+    List<RefundOrder> refundListByConditionExport(String itemType, String tradeNo, String startDate, String endDate, String miniAppName, Integer orgId, String auditStatus);
 
 
     /**

src/main/java/com/huiju/estateagents/redpack/service/impl/TaOrgOrderServiceImpl.java

@@ -121,9 +121,6 @@ public class TaOrgOrderServiceImpl extends ServiceImpl<TaOrgOrderMapper, TaOrgOr
         if (CommConstant.ITEM_TYPE_RECHARGE.equals(orderType) || CommConstant.ITEM_TYPE_REFUND.equals(orderType)) {
             result = taOrgOrderMapper.orderListByRechargeOrRefund(pg, orderType, orgId, tradeNo, isOffline, tradingStatus, startDate, endDate, miniAppName, auditStatus, payStartDate, payEndDate);
             result.getRecords().forEach(e -> {
-                if (CommConstant.ITEM_TYPE_REFUND.equals(orderType)){
-                    e.setAvailableBalance(calculateAvailableAmount(e.getOrgId()));
-                }
                 e.setCertificateUrlList(getCertificateByOrderId(e.getOrderId()));
             });
             return result;
@@ -137,7 +134,7 @@ public class TaOrgOrderServiceImpl extends ServiceImpl<TaOrgOrderMapper, TaOrgOr
 
     @Override
     public List<RechargeOrder> rechargeListByConditionExport(String itemType, String tradeNo, Integer isOffline, String tradingStatus, String startDate, String endDate, String miniAppName, Integer orgId) {
-        List<RechargeOrder> result = taOrgOrderMapper.orderListByRechargeOrRefundExport(itemType, tradeNo, isOffline, tradingStatus, startDate, endDate, miniAppName, orgId);
+        List<RechargeOrder> result = taOrgOrderMapper.rechargeListByConditionExport(itemType, tradeNo, isOffline, tradingStatus, startDate, endDate, miniAppName, orgId);
         return result;
     }
 
@@ -148,8 +145,8 @@ public class TaOrgOrderServiceImpl extends ServiceImpl<TaOrgOrderMapper, TaOrgOr
     }
 
     @Override
-    public List<RefundOrder> refundListByConditionExport(String itemType, String tradeNo, String startDate, String endDate, String miniAppName, Integer orgId) {
-        List<RefundOrder> result = taOrgOrderMapper.orderListByRefundExport(itemType, tradeNo, startDate, endDate, miniAppName, orgId);
+    public List<RefundOrder> refundListByConditionExport(String itemType, String tradeNo, String startDate, String endDate, String miniAppName, Integer orgId, String auditStatus) {
+        List<RefundOrder> result = taOrgOrderMapper.orderListByRefundExport(itemType, tradeNo, startDate, endDate, miniAppName, orgId, auditStatus);
         return result;
     }
 

src/main/resources/mapper/TaBuildingMapper.xml

@@ -629,7 +629,6 @@
                     and  TO_DAYS(b.create_date) <= TO_DAYS(#{endDate})
                 </if>
             GROUP BY
-                b.person_id,
                 DATE_FORMAT( b.create_date, '%Y-%m-%d' )
         ) g ON t.date = g.create_date
         LEFT JOIN (
@@ -714,7 +713,6 @@
             and  TO_DAYS(b.create_date) &lt;= TO_DAYS(#{endDate})
         </if>
         GROUP BY
-        b.person_id,
         DATE_FORMAT( b.create_date, '%Y-%m-%d' )
         ) g ON t.date = g.create_date
         LEFT JOIN (

src/main/resources/mapper/redpack/TaOrgOrderMapper.xml

@@ -112,14 +112,14 @@
         GROUP BY t.order_id order by t.create_date desc
     </select>
 
-    <select id="orderListByRechargeOrRefundExport" resultType="com.huiju.estateagents.redpack.entity.RechargeOrder">
+    <select id="rechargeListByConditionExport" resultType="com.huiju.estateagents.redpack.entity.RechargeOrder">
         select
         t.trade_no as tradeNo,
         FORMAT(t.amount/100, 2) as amount,
         b.name as miniAppName,
         if(t.is_offline = 1, '运营手工充值', '业务线上充值') as isOffline,
         t.create_date as createDate,
-        if(t.trading_status = 'processing', '待支付', if(t.trading_status = 'success', '已支付','已超时')) as tradingStatus,
+        if(t.trading_status = 'processing', '待支付', if(t.trading_status = 'success', '已支付','失败')) as tradingStatus,
         if(t.is_offline = 0, t.pay_date, '') as payDate
         From ta_org_order t
         left join ta_org_order_detail a on t.order_id = a.order_id
@@ -516,6 +516,9 @@
         <if test="orgId != null and orgId != ''">
             and t.org_id = #{orgId}
         </if>
+        <if test="auditStatus != null and auditStatus != ''">
+            and d.audit_status = #{auditStatus}
+        </if>
         GROUP BY t.order_id order by t.create_date desc
     </select>