bug fix

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

@@ -113,6 +113,7 @@ public class TaOrgOrderController extends BaseController {
                                                    @RequestParam(value = "startDate", required = false) String startDate,
                                                    @RequestParam(value = "endDate", required = false) String endDate,
                                                    @RequestParam(value = "orderType", required = false) String orderType,
+                                                   @RequestParam(value = "orgId", required = false) Integer orgId,
                                                    HttpServletRequest request, HttpServletResponse response) throws IOException {
         response.setContentType("application/octet-stream");
         response.setCharacterEncoding("utf-8");
@@ -122,7 +123,7 @@ public class TaOrgOrderController extends BaseController {
         WriteSheet writeSheet = EasyExcel.writerSheet("活动统计").build();
 
         // 设置 sheet, 同一个sheet只需要设置一次
-        List<RechargeOrder> data = iTaOrgOrderService.rechargeListByConditionExport(orderType, tradeNo, isOffline, tradingStatus, startDate, endDate, miniAppName);
+        List<RechargeOrder> data = iTaOrgOrderService.rechargeListByConditionExport(orderType, tradeNo, isOffline, tradingStatus, startDate, endDate, miniAppName, orgId);
         excelWriter.write(data, writeSheet);
         // finish 会帮忙关闭流
         excelWriter.finish();
@@ -141,6 +142,7 @@ public class TaOrgOrderController extends BaseController {
                                    @RequestParam(value = "startDate", required = false) String startDate,
                                    @RequestParam(value = "endDate", required = false) String endDate,
                                    @RequestParam(value = "orderType", required = false) String orderType,
+                                   @RequestParam(value = "orgId", required = false) Integer orgId,
                                    HttpServletRequest request, HttpServletResponse response) throws IOException {
         response.setContentType("application/octet-stream");
         response.setCharacterEncoding("utf-8");
@@ -150,7 +152,7 @@ public class TaOrgOrderController extends BaseController {
         WriteSheet writeSheet = EasyExcel.writerSheet("活动统计").build();
 
         // 设置 sheet, 同一个sheet只需要设置一次
-        List<ConsumeOrder> data = iTaOrgOrderService.consumeListByConditionExport(orderType, tradeNo, receivePhone, tradingStatus, startDate, endDate, miniAppName);
+        List<ConsumeOrder> data = iTaOrgOrderService.consumeListByConditionExport(orderType, tradeNo, receivePhone, tradingStatus, startDate, endDate, miniAppName, orgId);
         excelWriter.write(data, writeSheet);
         // finish 会帮忙关闭流
         excelWriter.finish();
@@ -167,6 +169,7 @@ public class TaOrgOrderController extends BaseController {
                                    @RequestParam(value = "startDate", required = false) String startDate,
                                    @RequestParam(value = "endDate", required = false) String endDate,
                                    @RequestParam(value = "orderType", required = false) String orderType,
+                                   @RequestParam(value = "orgId", required = false) Integer orgId,
                                    HttpServletRequest request, HttpServletResponse response) throws IOException {
         response.setContentType("application/octet-stream");
         response.setCharacterEncoding("utf-8");
@@ -176,7 +179,7 @@ public class TaOrgOrderController extends BaseController {
         WriteSheet writeSheet = EasyExcel.writerSheet("活动统计").build();
 
         // 设置 sheet, 同一个sheet只需要设置一次
-        List<RefundOrder> data = iTaOrgOrderService.refundListByConditionExport(orderType, tradeNo, startDate, endDate, miniAppName);
+        List<RefundOrder> data = iTaOrgOrderService.refundListByConditionExport(orderType, tradeNo, startDate, endDate, miniAppName, orgId);
         excelWriter.write(data, writeSheet);
         // finish 会帮忙关闭流
         excelWriter.finish();

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

@@ -75,7 +75,8 @@ public interface TaOrgOrderMapper extends BaseMapper<TaOrgOrder> {
                                                           @Param("tradingStatus") String tradingStatus,
                                                           @Param("startDate") String startDate,
                                                           @Param("endDate") String endDate,
-                                                          @Param("miniAppName") String miniAppName);
+                                                          @Param("miniAppName") String miniAppName,
+                                                          @Param("orgId") Integer orgId);
 
     /**
      * 消费订单导出
@@ -88,7 +89,8 @@ public interface TaOrgOrderMapper extends BaseMapper<TaOrgOrder> {
                                                 @Param("tradingStatus") String tradingStatus,
                                                 @Param("startDate") String startDate,
                                                 @Param("endDate") String endDate,
-                                                @Param("miniAppName") String miniAppName);
+                                                @Param("miniAppName") String miniAppName,
+                                                @Param("orgId") Integer orgId);
 
     /**
      * 退款订单导出
@@ -99,7 +101,8 @@ public interface TaOrgOrderMapper extends BaseMapper<TaOrgOrder> {
                                               @Param("tradeNo") String tradeNo,
                                               @Param("startDate") String startDate,
                                               @Param("endDate") String endDate,
-                                              @Param("miniAppName") String miniAppName);
+                                              @Param("miniAppName") String miniAppName,
+                                              @Param("orgId") Integer orgId);
 
     /**
      * 获取充值订单列表

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

@@ -58,21 +58,21 @@ public interface ITaOrgOrderService extends IService<TaOrgOrder> {
      *
      * @return
      */
-    List<RechargeOrder> rechargeListByConditionExport(String itemType, String tradeNo, Integer isOffline, String tradingStatus, String startDate, String endDate, String miniAppName);
+    List<RechargeOrder> rechargeListByConditionExport(String itemType, String tradeNo, Integer isOffline, String tradingStatus, String startDate, String endDate, String miniAppName, Integer orgId);
 
     /**
      * 消费订单列表导出
      *
      * @return
      */
-    List<ConsumeOrder> consumeListByConditionExport(String itemType, String tradeNo, String receivePhone, String tradingStatus, String startDate, String endDate, String miniAppName);
+    List<ConsumeOrder> consumeListByConditionExport(String itemType, String tradeNo, String receivePhone, String tradingStatus, String startDate, String endDate, String miniAppName, Integer orgId);
 
     /**
      * 退款订单列表导出
      *
      * @return
      */
-    List<RefundOrder> refundListByConditionExport(String itemType, String tradeNo, String startDate, String endDate, String miniAppName);
+    List<RefundOrder> refundListByConditionExport(String itemType, String tradeNo, String startDate, String endDate, String miniAppName, Integer orgId);
 
 
     /**

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

@@ -135,7 +135,7 @@ public class TaOrgAccountServiceImpl extends ServiceImpl<TaOrgAccountMapper, TaO
         List<TaContact> taContacts = selectSmsContactUser();
         if (CollectionUtils.isNotEmpty(taContacts)){
             TaContact taContact = taContacts.get(0);
-            String[] smsParams = {"业务平台充值成功", taOrgOrder.getTradeNo()};
+            String[] smsParams = {"业务平台充值提醒", taOrgOrder.getTradeNo()};
             // 短信发送
             sendSmsMessage(taContact.getPhone(), CommConstant.ITEM_TYPE_RECHARGE, smsParams);
         }

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

@@ -131,20 +131,20 @@ 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) {
-        List<RechargeOrder> result = taOrgOrderMapper.orderListByRechargeOrRefundExport(itemType, tradeNo, isOffline, tradingStatus, startDate, endDate, miniAppName);
+    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);
         return result;
     }
 
     @Override
-    public List<ConsumeOrder> consumeListByConditionExport(String itemType, String tradeNo, String receivePhone, String tradingStatus, String startDate, String endDate, String miniAppName) {
-        List<ConsumeOrder> result = taOrgOrderMapper.orderListByConsumeExport(itemType, tradeNo, receivePhone, tradingStatus, startDate, endDate, miniAppName);
+    public List<ConsumeOrder> consumeListByConditionExport(String itemType, String tradeNo, String receivePhone, String tradingStatus, String startDate, String endDate, String miniAppName, Integer orgId) {
+        List<ConsumeOrder> result = taOrgOrderMapper.orderListByConsumeExport(itemType, tradeNo, receivePhone, tradingStatus, startDate, endDate, miniAppName, orgId);
         return result;
     }
 
     @Override
-    public List<RefundOrder> refundListByConditionExport(String itemType, String tradeNo, String startDate, String endDate, String miniAppName) {
-        List<RefundOrder> result = taOrgOrderMapper.orderListByRefundExport(itemType, tradeNo, startDate, endDate, miniAppName);
+    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);
         return result;
     }
 

src/main/java/com/huiju/estateagents/service/impl/TaMiniappServiceImpl.java

@@ -94,7 +94,12 @@ public class TaMiniappServiceImpl extends ServiceImpl<TaMiniappMapper, TaMiniapp
             wxUtils.newService(taMiniapp, true);
         }
 
-        createOrgAccount(taMiniapp.getOrgId(), taMiniapp.getName());
+        QueryWrapper<TaOrgAccount> taOrgAccountQueryWrapper = new QueryWrapper<>();
+        taOrgAccountQueryWrapper.eq("org_id", taMiniapp.getOrgId());
+        Integer count = taOrgAccountMapper.selectCount(taOrgAccountQueryWrapper);
+        if (count < 1){
+            createOrgAccount(taMiniapp.getOrgId(), taMiniapp.getName());
+        }
 
         return taMiniapp;
     }

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

@@ -17,7 +17,8 @@
             d.audit_status,
             d.audit_result,
         </if>
-        t.trading_status
+        t.trading_status,
+        t.pay_date
         From ta_org_order t
         left join ta_org_order_detail a on t.order_id = a.order_id
         left join ta_miniapp b on t.org_id = b.org_id
@@ -62,7 +63,8 @@
         t.create_date,
         c.phone,
         t.trading_status,
-        d.`name` as activityName
+        d.`name` as activityName,
+        t.pay_date
         From ta_org_order t
         left join ta_org_order_detail a on t.order_id = a.order_id
         left join ta_miniapp b on t.org_id = b.org_id
@@ -105,7 +107,7 @@
         t.trade_no as tradeNo,
         FORMAT(t.amount/100, 2) as amount,
         b.name as miniAppName,
-        if(t.is_offline = 1, '业务线上充值', '运营手工充值') as isOffline,
+        if(t.is_offline = 1, '运营手工充值', '业务线上充值') as isOffline,
         t.create_date as createDate,
         if(t.trading_status = 'processing', '待支付', if(t.trading_status = 'success', '已支付','已超时')) as tradingStatus,
         t.pay_date as payDate
@@ -132,6 +134,9 @@
         <if test="miniAppName != null and miniAppName != ''">
             and b.name like concat('%', #{miniAppName}, '%')
         </if>
+        <if test="orgId != null and orgId != ''">
+            and t.org_id = #{orgId}
+        </if>
         GROUP BY t.order_id order by t.create_date desc
     </select>
 
@@ -170,6 +175,9 @@
         <if test="miniAppName != null and miniAppName != ''">
             and b.name like concat('%', #{miniAppName}, '%')
         </if>
+        <if test="orgId != null and orgId != ''">
+            and t.org_id = #{orgId}
+        </if>
         GROUP BY t.order_id order by t.create_date desc
     </select>
 
@@ -471,12 +479,11 @@
         b.name as miniAppName,
         t.create_date as createDate,
         d.audit_result as auditResult,
-        if(d.audit_status = 'checking', '未审核', if(d.audit_status = 'unAgree', '不同意','同意')) as auditStatus
+        if(d.audit_status = 'checking', '已申请', if(d.audit_status = 'unAgree', '已驳回','已退款')) as auditStatus
         From ta_org_order t
         left join ta_org_order_detail a on t.order_id = a.order_id
         left join ta_miniapp b on t.org_id = b.org_id
-        left join ta_org_account_certificate c on t.order_id = c.order_id
-        left join ta_org_refund_application d on d.org_id = t.org_id
+        left join ta_org_refund_application d on d.org_id = t.org_id and t.order_id = d.order_id
         where
         a.item_type = #{itemType}
         <if test="tradeNo != null and tradeNo != ''">
@@ -491,6 +498,9 @@
         <if test="miniAppName != null and miniAppName != ''">
             and b.name like concat('%', #{miniAppName}, '%')
         </if>
+        <if test="orgId != null and orgId != ''">
+            and t.org_id = #{orgId}
+        </if>
         GROUP BY t.order_id order by t.create_date desc
     </select>