فهرست منبع

查询重复入账

wanxl 1 سال پیش
والد
کامیت
8e83ca7af1

+ 2 - 0
src/main/java/com/sqx/modules/app/dao/UserMoneyDetailsDao.java

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

+ 1 - 0
src/main/java/com/sqx/modules/app/service/UserMoneyDetailsService.java

@@ -62,4 +62,5 @@ public interface UserMoneyDetailsService extends IService<UserMoneyDetails> {
      */
     ExcelData excelAccountEntry(AccountEntry query);
 
+    Result accountEntryAbnormal(AccountEntry accountEntry);
 }

+ 7 - 0
src/main/java/com/sqx/modules/app/service/impl/UserMoneyDetailsServiceImpl.java

@@ -245,4 +245,11 @@ public class UserMoneyDetailsServiceImpl extends ServiceImpl<UserMoneyDetailsDao
         data.setRows(rows);
         return data;
     }
+
+    @Override
+    public Result accountEntryAbnormal(AccountEntry accountEntry) {
+        Page<UserMoneyDetails> pages = new Page<>(accountEntry.getPage(), accountEntry.getLimit());
+        PageUtils pageUtils = new PageUtils(baseMapper.accountEntryAbnormal(pages, accountEntry));
+        return Result.success().put("data", pageUtils);
+    }
 }

+ 2 - 1
src/main/java/com/sqx/modules/exportExecl/dto/AccountEntry.java

@@ -1,10 +1,11 @@
 package com.sqx.modules.exportExecl.dto;
 
+import com.sqx.common.query.PageQuery;
 import lombok.Data;
 import org.springframework.util.StringUtils;
 
 @Data
-public class AccountEntry {
+public class AccountEntry extends PageQuery {
 
     private String shopName;
     private String shopPhone;

+ 8 - 0
src/main/java/com/sqx/modules/shop/controller/app/ShopMoneyController.java

@@ -9,6 +9,7 @@ import com.sqx.modules.app.service.UserMoneyDetailsService;
 import com.sqx.modules.app.service.UserMoneyService;
 import com.sqx.modules.app.service.UserService;
 import com.sqx.modules.datacentre.entity.SysUserShop;
+import com.sqx.modules.exportExecl.dto.AccountEntry;
 import com.sqx.modules.goods.dao.GoodsShopDao;
 import com.sqx.modules.goods.entity.GoodsShop;
 import com.sqx.modules.pay.controller.app.AliPayController;
@@ -187,4 +188,11 @@ public class ShopMoneyController extends AbstractController {
         return Result.success().put("data", pageUtils);
     }
 
+    @GetMapping(value = "/accountEntryAbnormal")
+    @ApiOperation("异常入账管理")
+    public Result accountEntryAbnormal(AccountEntry accountEntry){
+        return userMoneyDetailsService.accountEntryAbnormal(accountEntry);
+
+    }
+
 }

+ 1 - 1
src/main/resources/application-dev.yml

@@ -47,7 +47,7 @@ spring:
                 max-wait: -1
 secure-api:
     # 开启SecureApi功能,如果为false则其余配置项均不生效
-    enabled: true
+    enabled: false
     # 开启加解密日志打印,会打印出接口名、加密模式、算法、明文和密文等信息
     show-log: true
     url-safe: true

+ 84 - 0
src/main/resources/mapper/userMoney/UserMoneyDetailsMapper.xml

@@ -316,4 +316,88 @@
         ORDER BY umd2.id desc
     </select>
 
+    <select id="accountEntryAbnormal" 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 umd.title in (select
+        title
+        from
+        user_money_details
+        where
+        title like '商户订单收入%'
+        group by title
+        HAVING COUNT(*) > 1
+        order by shop_id )
+        ) 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.orderNumber,umd2.id desc
+    </select>
 </mapper>