入账管理增加是否异常参数，合并查询和导出接口，增加异常订单导出

src/main/java/com/sqx/modules/app/dao/UserMoneyDetailsDao.java

@@ -48,4 +48,6 @@ public interface UserMoneyDetailsDao extends BaseMapper<UserMoneyDetails> {
     List<UserMoneyDetails> excelAccountEntry(@Param("query") AccountEntry query);
 
     IPage<UserMoneyDetails> accountEntryAbnormal(Page<UserMoneyDetails> pages,@Param("query") AccountEntry query);
+
+    List<UserMoneyDetails> excelAccountEntryAbnormal(@Param("query") AccountEntry query);
 }

src/main/java/com/sqx/modules/app/service/UserMoneyDetailsService.java

@@ -53,7 +53,7 @@ public interface UserMoneyDetailsService extends IService<UserMoneyDetails> {
      * @param endTime
      * @return
      */
-    PageUtils accountEntryManagementDetails(Integer page, Integer limit, String shopName, String shopPhone, String userPhone, String couponName, String orderNumber, String startTime, String endTime);
+    PageUtils accountEntryManagementDetails(Integer page, Integer limit, String shopName, String shopPhone, String userPhone, String couponName, String orderNumber, String startTime, String endTime,String flag);
 
     /**
      * 入账管理导出

src/main/java/com/sqx/modules/app/service/impl/UserMoneyDetailsServiceImpl.java

@@ -140,9 +140,22 @@ public class UserMoneyDetailsServiceImpl extends ServiceImpl<UserMoneyDetailsDao
 
 
     @Override
-    public PageUtils accountEntryManagementDetails(Integer page, Integer limit, String shopName, String shopPhone, String userPhone, String couponName, String orderNumber, String startTime, String endTime) {
+    public PageUtils accountEntryManagementDetails(Integer page, Integer limit, String shopName, String shopPhone, String userPhone, String couponName, String orderNumber, String startTime, String endTime,String flag) {
         IPage<UserMoneyDetails> iPage = new Page<>();
         Integer row=(page-1)*limit;
+        if("1".equals(flag)){
+            Page<UserMoneyDetails> pages = new Page<>(page, limit);
+            AccountEntry query = new AccountEntry();
+            query.setEndTime(endTime);
+            query.setShopName(shopName);
+            query.setStartTime(startTime);
+            query.setUserPhone(userPhone);
+            query.setCouponName(couponName);
+            query.setOrderNumber(orderNumber);
+            query.setShopPhone(shopPhone);
+            PageUtils pageUtils = new PageUtils(baseMapper.accountEntryAbnormal(pages, query));
+            return pageUtils;
+        }
         List<UserMoneyDetails> userMoneyDetailsList = baseMapper.accountEntryManagementDetailsList(row,limit, shopName, shopPhone, userPhone, couponName, orderNumber, startTime, endTime);
 //        查询每条成功的短信金额
         CommonInfo commonInfo = commonInfoDao.findOne(421);
@@ -208,7 +221,12 @@ public class UserMoneyDetailsServiceImpl extends ServiceImpl<UserMoneyDetailsDao
      */
     @Override
     public ExcelData excelAccountEntry(AccountEntry query) {
-        List<UserMoneyDetails> userMoneyDetailsList = baseMapper.excelAccountEntry(query);
+        List<UserMoneyDetails> userMoneyDetailsList;
+        if("1".equals(query.getFlag())){
+            userMoneyDetailsList = baseMapper.excelAccountEntryAbnormal(query);
+        }else{
+            userMoneyDetailsList = baseMapper.excelAccountEntry(query);
+        }
         ExcelData data = new ExcelData();
         data.setName("入账管理");
         List<String> titleList=Arrays.asList(

src/main/java/com/sqx/modules/exportExecl/dto/AccountEntry.java

@@ -15,6 +15,7 @@ public class AccountEntry extends PageQuery {
     private String startTime;
     private String endTime;
     private String userId;
+    private String flag;
 
     public String toStrMessage() {
         return (StringUtils.hasText(shopName) ? "商铺名称：" + shopName + ";" : "") +
@@ -23,7 +24,8 @@ public class AccountEntry extends PageQuery {
                 (StringUtils.hasText(couponName) ? "优惠活动：" + couponName + ";" : "") +
                 (StringUtils.hasText(orderNumber) ? "订单号：" + orderNumber + ";" : "") +
                 (StringUtils.hasText(startTime) ? "开始时间：" + startTime + ";" : "") +
-                (StringUtils.hasText(endTime) ? "结束时间：" + endTime + ";" : "");
+                (StringUtils.hasText(endTime) ? "结束时间：" + endTime + ";" : "")+
+                ("1".equals(flag) ? "是否异常订单： 是;" : "是否异常订单：否");
     }
 
     public String toStrCode() {
@@ -35,6 +37,7 @@ public class AccountEntry extends PageQuery {
                 +","+(orderNumber==null?"":orderNumber)
                 +","+(startTime==null?"":startTime)
                 +","+(endTime==null?"":endTime)
+                +","+(flag==null?"":flag)
                 +",";
     }
 }

src/main/java/com/sqx/modules/shop/controller/app/ShopMoneyController.java

@@ -183,8 +183,8 @@ public class ShopMoneyController extends AbstractController {
 
     @GetMapping(value = "/accountEntryManagement")
     @ApiOperation("入账管理")
-    public Result accountEntryManagement(Integer page, Integer limit,String shopName,String shopPhone,String userPhone,String couponName,String orderNumber,String startTime,String endTime){
-        PageUtils pageUtils = userMoneyDetailsService.accountEntryManagementDetails(page, limit, shopName, shopPhone, userPhone, couponName, orderNumber, startTime, endTime);
+    public Result accountEntryManagement(Integer page, Integer limit,String shopName,String shopPhone,String userPhone,String couponName,String orderNumber,String startTime,String endTime,String flag){
+        PageUtils pageUtils = userMoneyDetailsService.accountEntryManagementDetails(page, limit, shopName, shopPhone, userPhone, couponName, orderNumber, startTime, endTime,flag);
         return Result.success().put("data", pageUtils);
     }
 

src/main/java/com/sqx/scheduler/export/ExportScheduler.java

@@ -291,6 +291,7 @@ public class ExportScheduler {
         query.setOrderNumber(conditions[5]);
         query.setStartTime(conditions[6]);
         query.setEndTime(conditions[7]);
+        query.setFlag(conditions[8]);
         return userMoneyDetailsService.excelAccountEntry(query);
     }
     //导出骑手收益排行

src/main/resources/mapper/userMoney/UserMoneyDetailsMapper.xml

@@ -401,4 +401,90 @@
         </if>
         ORDER BY umd2.id desc
     </select>
+
+    <select id="excelAccountEntryAbnormal" resultType="com.sqx.modules.app.entity.UserMoneyDetails">
+        SELECT
+        umd2.id,
+        umd2.orderNumber,
+        umd2.user_id as userId,
+        umd2.shop_id as shopId,
+        umd2.title,
+        umd2.content,
+        umd2.type,
+        umd2.classify,
+        umd2.money,
+        umd2.create_time as createTime,
+        umd2.state,
+        tbu.user_name as userName,
+        tbu.phone as userPhone,
+        gs.shop_name as shopName,
+        gs.phone as shopPhone,
+        tcu.coupon_name as couponName,
+        tcu.money as couponMoney,
+        apr.discount_amount as activityDiscountAmount,
+        tbo.errand_money as errandMoney
+        FROM
+        (
+        SELECT
+        RIGHT( umd.title, 18 ) AS orderNumber,
+        umd.id,
+        umd.user_id,
+        umd.shop_id,
+        umd.title,
+        umd.content,
+        umd.type,
+        umd.classify,
+        umd.money,
+        umd.create_time,
+        umd.state,
+        umd.children_id
+        FROM
+        `user_money_details` umd
+        WHERE
+        umd.type = 1
+        AND umd.classify = 3
+        AND umd.shop_id IS NOT NULL
+        AND umd.state=2
+        AND EXISTS
+        (select
+        umd3.id
+        from
+        `user_money_details` umd3
+        where
+        umd3.title like '商户订单收入%'
+        and umd.title =umd3.title
+        group by umd3.title
+        HAVING COUNT(*) > 1)
+        ) umd2
+        LEFT JOIN tb_order tbo on tbo.order_number=umd2.orderNumber
+        LEFT JOIN tb_user tbu on tbu.user_id=tbo.user_id
+        LEFT JOIN goods_shop gs on gs.shop_id=tbo.shop_id
+        LEFT JOIN tb_coupon_user tcu on tbo.coupon_id = tcu.id
+        LEFT JOIN activity_part_record apr on apr.order_id = tbo.order_id
+        where 1 = 1
+        <if test="query.shopName != null and query.shopName != ''">
+            and gs.shop_name like  concat("%", #{query.shopName}, "%")
+        </if>
+
+        <if test="query.shopPhone != null and query.shopPhone != ''">
+            and gs.phone= #{query.shopPhone}
+        </if>
+
+        <if test="query.userPhone != null and query.userPhone != ''">
+            and tbu.phone=#{query.userPhone}
+        </if>
+
+        <if test="query.couponName != null and query.couponName != ''">
+            and tcu.coupon_name like  concat("%", #{query.couponName}, "%")
+        </if>
+
+        <if test="query.orderNumber != null and query.orderNumber != ''">
+            and tbo.order_number = #{query.orderNumber}
+        </if>
+
+        <if test="query.startTime != null and query.startTime != '' and query.endTime != null and query.endTime != ''">
+            and umd2.create_time >= #{query.startTime} and #{query.endTime} >= umd2.create_time
+        </if>
+        ORDER BY umd2.id desc
+    </select>
 </mapper>