后端 BUG
This commit is contained in:
zhaohengkun
parent
89e1f60ac7
commit
2d279e136e
@ -253,8 +253,8 @@ public class AllOrderInfoController extends BaseController {
|
||||
return getSuccessResult(allOrderInfoService.getAmount1(allOrderInfo));
|
||||
}
|
||||
|
||||
|
||||
@GetMapping("getFenxiByDaili")
|
||||
// 支付通道分析 下面列表数据
|
||||
@GetMapping("/getFenxiByDaili")
|
||||
public ResponseObject getFenxiByDaili(AllOrderInfo allOrderInfo,
|
||||
@RequestParam(value = "page",defaultValue = "1") Integer pageNo,
|
||||
@RequestParam(value = "pageSize",defaultValue = "10") Integer pageSize){
|
||||
@ -262,8 +262,8 @@ public class AllOrderInfoController extends BaseController {
|
||||
IPage<AllOrderInfoVo> list = allOrderInfoService.getFenxiByDaili(page, allOrderInfo);
|
||||
return getSuccessResult(list);
|
||||
}
|
||||
|
||||
@GetMapping("getFenxiByDailiType")
|
||||
// 获取 支付方式 下面列表数据
|
||||
@GetMapping("/getFenxiByDailiType")
|
||||
public ResponseObject getFenxiByDailiType(AllOrderInfo allOrderInfo,
|
||||
@RequestParam(value = "page",defaultValue = "1") Integer pageNo,
|
||||
@RequestParam(value = "pageSize",defaultValue = "10") Integer pageSize){
|
||||
@ -271,11 +271,12 @@ public class AllOrderInfoController extends BaseController {
|
||||
IPage<AllOrderInfoVo> list = allOrderInfoService.getFenxiByDailiType(page, allOrderInfo);
|
||||
return getSuccessResult(list);
|
||||
}
|
||||
|
||||
// 获取 支付方式 上面统计数据
|
||||
@GetMapping("/getFenxiByDailiTypeBydata")
|
||||
public ResponseObject getFenxiByDailiTypeBydata(AllOrderInfoVo allOrderInfo){
|
||||
return getSuccessResult(allOrderInfoService.getFenxiByDailiTypeBydata(allOrderInfo));
|
||||
}
|
||||
// 支付通道分析 上面 统计数据
|
||||
@GetMapping("/getFenxiByDailiBydata")
|
||||
public ResponseObject getFenxiByDailiBydata(AllOrderInfoVo allOrderInfo){
|
||||
return getSuccessResult(allOrderInfoService.getFenxiByDailiBydata(allOrderInfo));
|
||||
|
||||
@ -19,6 +19,7 @@ import com.fuint.business.userManager.vo.UserBalanceVo;
|
||||
import org.apache.ibatis.annotations.Param;
|
||||
|
||||
import java.math.BigDecimal;
|
||||
import java.util.HashMap;
|
||||
import java.util.List;
|
||||
import java.util.Map;
|
||||
|
||||
@ -90,7 +91,7 @@ public interface AllOrderInfoMapper extends BaseMapper<AllOrderInfo> {
|
||||
String getCardGift(@Param("order") UserBalanceVo record);
|
||||
|
||||
|
||||
AllOrderInfoVo getPaymentChannelData(Integer storeId);
|
||||
AllOrderInfoVo getPaymentChannelData(@Param("order")Map<String,Object> map);
|
||||
|
||||
IPage<AllOrderInfoVo> runningWaterByInstituion2(Page page,@Param("order") AllOrderInfoDto allOrderInfo);
|
||||
|
||||
|
||||
@ -516,13 +516,13 @@
|
||||
SELECT
|
||||
-- 总消费
|
||||
COALESCE(SUM(CASE WHEN type NOT IN (3, 5) AND ref_by IS NULL THEN pay_money ELSE 0 END), 0) AS s1,
|
||||
COUNT(CASE WHEN type NOT IN (3, 5) AND ref_by IS NULL THEN pay_money ELSE 0 END) AS s1c,
|
||||
COUNT(CASE WHEN type NOT IN (3, 5) AND ref_by IS NULL THEN pay_money ELSE 0 END) AS s1c,
|
||||
-- 总充值
|
||||
COALESCE(SUM(CASE WHEN type = 3 AND ref_by IS NULL THEN pay_money ELSE 0 END), 0) AS s2,
|
||||
COUNT(CASE WHEN type = 3 AND ref_by IS NULL THEN pay_money ELSE 0 END) AS s2c,
|
||||
COALESCE(SUM(CASE WHEN type = 3 AND ref_by IS NULL THEN pay_money ELSE 0 END), 0) AS s2,
|
||||
COUNT(CASE WHEN type = 3 AND ref_by IS NULL THEN pay_money ELSE 0 END) AS s2c,
|
||||
-- 退款总金额 次数
|
||||
COALESCE(SUM(CASE WHEN ref_by IS NOT NULL THEN ref_money ELSE 0 END), 0) AS s3,
|
||||
COUNT(CASE WHEN ref_by IS NOT NULL THEN ref_money ELSE 0 END) AS s3c
|
||||
COALESCE(SUM(CASE WHEN ref_by IS NOT NULL THEN ref_money ELSE 0 END), 0) AS s3,
|
||||
COUNT(CASE WHEN ref_by IS NOT NULL THEN ref_money ELSE 0 END) AS s3c
|
||||
FROM all_order_info
|
||||
where user_id = #{order.mtUserId}
|
||||
</select>
|
||||
@ -538,7 +538,7 @@
|
||||
SUM(CASE WHEN all_order_info.type = 3 AND all_order_info.ref_by IS NULL THEN all_order_info.pay_money ELSE 0
|
||||
END) AS tongjMoney
|
||||
FROM all_order_info
|
||||
INNER JOIN (
|
||||
INNER JOIN (
|
||||
SELECT mt_user.*
|
||||
FROM mt_user_balance
|
||||
LEFT JOIN mt_user ON mt_user_balance.mt_user_id = mt_user.id
|
||||
@ -553,8 +553,8 @@
|
||||
|
||||
<select id="getCardGift" resultType="java.lang.String">
|
||||
select
|
||||
SUM(CASE WHEN card_gift.status=1 THEN card_gift.card_amount ELSE 0 END) as cardGiftMoney
|
||||
from card_gift
|
||||
SUM(CASE WHEN card_gift.status=1 THEN card_gift.card_amount ELSE 0 END) as cardGiftMoney
|
||||
from card_gift
|
||||
JOIN (
|
||||
SELECT mt_user.*
|
||||
FROM mt_user_balance
|
||||
@ -608,7 +608,6 @@
|
||||
sum(CASE WHEN pay_type = 'balance' THEN pay_money ELSE 0 END) balanceMoney,
|
||||
sum(CASE WHEN pay_type = 'ALIPAY' THEN pay_money ELSE 0 END) alipayMoney,
|
||||
sum(CASE WHEN status = 'refund' THEN pay_money ELSE 0 END) refMoney,
|
||||
# count(CASE WHEN status = 'refund' THEN pay_money ELSE 0 END) refCount
|
||||
count(CASE WHEN status = 'refund' THEN 1 ELSE NULL END) refCount
|
||||
from all_order_info
|
||||
<where>
|
||||
@ -694,12 +693,16 @@
|
||||
group by store_id
|
||||
</select>
|
||||
<select id="getFenxiByDailiTypeBydata" resultType="java.util.Map">
|
||||
SELECT
|
||||
count(distinct store_id) storeId,
|
||||
SUM(pay_money) payMoney,
|
||||
select
|
||||
count( DISTINCT store_id ) storeId,
|
||||
-- 交易总金额
|
||||
SUM( pay_money ) payMoney,
|
||||
-- 交易笔数
|
||||
count(*) count,
|
||||
sum(CASE WHEN status = 'refund' THEN pay_money ELSE 0 END) refMoney,
|
||||
count(CASE WHEN status = 'refund' THEN 1 ELSE 0 END) refCount
|
||||
-- 退款金额
|
||||
sum( CASE WHEN STATUS = 'refund' THEN pay_money ELSE 0 END ) refMoney,
|
||||
-- 退款笔数
|
||||
count( CASE WHEN STATUS = 'refund' THEN 1 ELSE NULL END ) refCount
|
||||
from all_order_info
|
||||
<where>
|
||||
<if test="order.storeIds != null">
|
||||
@ -725,10 +728,15 @@
|
||||
count(CASE WHEN payment_channel = '富友' THEN 1 ELSE 0 END) AS fuYouCount,
|
||||
count(CASE WHEN payment_channel = '拉卡拉' THEN 1 ELSE 0 END) AS laKaLaCount
|
||||
from all_order_info
|
||||
<where>
|
||||
store_id = #{storeId}
|
||||
where
|
||||
store_id = #{order.storeId}
|
||||
<if test="order.beginTime != null and order.beginTime != ''"><!-- 开始时间检索 -->
|
||||
and date_format(create_time,'%y%m%d') >= date_format(#{order.beginTime},'%y%m%d')
|
||||
</if>
|
||||
<if test="order.endTime != null and order.endTime != ''"><!-- 结束时间检索 -->
|
||||
and date_format(create_time,'%y%m%d') <= date_format(#{order.endTime},'%y%m%d')
|
||||
</if>
|
||||
|
||||
</where>
|
||||
</select>
|
||||
<select id="runningWaterByInstituion2" resultType="com.fuint.business.order.vo.AllOrderInfoVo">
|
||||
SELECT SUM(pay_money) payMoney,
|
||||
|
||||
@ -150,7 +150,7 @@ public class AllOrderInfoServiceImpl extends ServiceImpl<AllOrderInfoMapper, All
|
||||
row = baseMapper.insert(allOrderInfo);
|
||||
return row;
|
||||
}
|
||||
|
||||
// 支付通道分析 下面列表数据
|
||||
public IPage<AllOrderInfoVo> getFenxiByDaili(Page page, AllOrderInfo allOrderInfo) {
|
||||
if (ObjectUtil.isEmpty(allOrderInfo.getDeptId())) {
|
||||
AccountInfo nowAccountInfo = TokenUtil.getNowAccountInfo();
|
||||
@ -160,9 +160,13 @@ public class AllOrderInfoServiceImpl extends ServiceImpl<AllOrderInfoMapper, All
|
||||
List<Long> strings = sysDeptMapper.selectChildByDeptIdR(allOrderInfo.getDeptId());
|
||||
List<Long> longs = mtStoreMapper.queryStoresByDeptIdsR(strings);
|
||||
allOrderInfo.setStoreIds(longs);
|
||||
|
||||
// 根据 store_id 店铺id 查询 订单表 all_order_info 总表
|
||||
IPage<AllOrderInfoVo> fenxiByDaili = allOrderInfoMapper.getFenxiByDaili(page, allOrderInfo);
|
||||
HashMap<String, Object> m1 = new HashMap<>();
|
||||
m1.put("beginTime", allOrderInfo.getParams().get("beginTime"));
|
||||
m1.put("endTime", allOrderInfo.getParams().get("endTime"));
|
||||
for (AllOrderInfoVo record : fenxiByDaili.getRecords()) {
|
||||
//
|
||||
MtStore mtStore = mtStoreMapper.selectById(record.getStoreId());
|
||||
if (ObjectUtil.isNotEmpty(mtStore)) {
|
||||
SysDept byId = deptService.getById(mtStore.getContractDeptId());
|
||||
@ -172,7 +176,8 @@ public class AllOrderInfoServiceImpl extends ServiceImpl<AllOrderInfoMapper, All
|
||||
|
||||
List<Integer> storeIds = new ArrayList<>();
|
||||
// storeIds.add(mtStore.getId());
|
||||
AllOrderInfoVo paymentChannelData = allOrderInfoMapper.getPaymentChannelData(record.getStoreId());
|
||||
m1.put("storeId", record.getStoreId());
|
||||
AllOrderInfoVo paymentChannelData = allOrderInfoMapper.getPaymentChannelData(m1);
|
||||
record.setFuYouAmount(paymentChannelData.getFuYouAmount());
|
||||
record.setFuYouCount(paymentChannelData.getFuYouCount());
|
||||
record.setLaKaLaAmount(paymentChannelData.getLaKaLaAmount());
|
||||
@ -184,7 +189,6 @@ public class AllOrderInfoServiceImpl extends ServiceImpl<AllOrderInfoMapper, All
|
||||
}
|
||||
|
||||
List<allorderVOo> fenxiByDaili2 = allOrderInfoMapper.getFenxiByDaili2(allOrderInfo);
|
||||
record.setPayMoney(convertPayMoneyToWanYuan(record.getPayMoney()));
|
||||
|
||||
record.setFenxiByDaili2(fenxiByDaili2);
|
||||
}
|
||||
@ -210,7 +214,7 @@ public class AllOrderInfoServiceImpl extends ServiceImpl<AllOrderInfoMapper, All
|
||||
|
||||
return fenxiByDailiTypeBydata;
|
||||
}
|
||||
|
||||
// 支付通道分析 上面 统计数据
|
||||
@Override
|
||||
public Map<String, Object> getFenxiByDailiBydata(AllOrderInfo allOrderInfo) {
|
||||
if (ObjectUtil.isEmpty(allOrderInfo.getDeptId())) {
|
||||
|
||||
Loading…
Reference in New Issue
Block a user