no message
This commit is contained in:
parent
891d047581
commit
0cc396634b
1
.gitignore
vendored
1
.gitignore
vendored
@ -22,4 +22,5 @@ bin-release/
|
|||||||
/gasStation-uni/uni_modules/
|
/gasStation-uni/uni_modules/
|
||||||
/gasStation-uni/unpackage/
|
/gasStation-uni/unpackage/
|
||||||
/gasStation-uni/node_modules/
|
/gasStation-uni/node_modules/
|
||||||
|
/pos-uni/unpackage/
|
||||||
node_modules
|
node_modules
|
||||||
|
@ -192,4 +192,10 @@ public class AllOrderInfoController extends BaseController {
|
|||||||
public ResponseObject runningWaterByTissue(){
|
public ResponseObject runningWaterByTissue(){
|
||||||
return getSuccessResult(TokenUtil.getNowAccountInfo());
|
return getSuccessResult(TokenUtil.getNowAccountInfo());
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
@GetMapping("getIndexData4Pos")
|
||||||
|
public ResponseObject getIndexData4Pos(){
|
||||||
|
return getSuccessResult(allOrderInfoService.getIndexData4Pos());
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
@ -44,4 +44,7 @@ public interface AllOrderInfoMapper extends BaseMapper<AllOrderInfo> {
|
|||||||
* @return
|
* @return
|
||||||
*/
|
*/
|
||||||
Integer selectByPayStatusNum(AllOrderInfo allOrderInfo);
|
Integer selectByPayStatusNum(AllOrderInfo allOrderInfo);
|
||||||
|
|
||||||
|
AllOrderInfoVo getIndexData4Pos(@Param("allOrderInfo") AllOrderInfoDto allOrderInfo);
|
||||||
|
|
||||||
}
|
}
|
||||||
|
@ -344,4 +344,14 @@
|
|||||||
</where>
|
</where>
|
||||||
|
|
||||||
</select>
|
</select>
|
||||||
|
<select id="getIndexData4Pos" resultType="com.fuint.business.order.vo.AllOrderInfoVo">
|
||||||
|
SELECT
|
||||||
|
SUM(pay_money) AS total_pay_money,
|
||||||
|
COUNT(*) AS total_count,
|
||||||
|
SUM(CASE WHEN status = 'refund' THEN pay_money ELSE 0 END) AS total_refund
|
||||||
|
FROM
|
||||||
|
all_order_info
|
||||||
|
WHERE
|
||||||
|
DATE(pay_time) = CURDATE();
|
||||||
|
</select>
|
||||||
</mapper>
|
</mapper>
|
@ -87,4 +87,7 @@ public interface AllOrderInfoService {
|
|||||||
AllOrderInfoVo runningWaterByData(Page page, AllOrderInfoDto allOrderInfo);
|
AllOrderInfoVo runningWaterByData(Page page, AllOrderInfoDto allOrderInfo);
|
||||||
IPage<SysDeptVo> runningWaterByTissue(Page page, AllOrderInfoDto allOrderInfo);
|
IPage<SysDeptVo> runningWaterByTissue(Page page, AllOrderInfoDto allOrderInfo);
|
||||||
|
|
||||||
|
AllOrderInfoVo getIndexData4Pos();
|
||||||
|
|
||||||
|
|
||||||
}
|
}
|
||||||
|
@ -893,6 +893,23 @@ public class AllOrderInfoServiceImpl extends ServiceImpl<AllOrderInfoMapper,AllO
|
|||||||
IPage<SysDeptVo> sysDepts = sysDeptMapper.selectChildrenDeptById2(page, nowAccountInfo.getDeptId(),allOrderInfo.getDeptId(), allOrderInfo.getDeptType());
|
IPage<SysDeptVo> sysDepts = sysDeptMapper.selectChildrenDeptById2(page, nowAccountInfo.getDeptId(),allOrderInfo.getDeptId(), allOrderInfo.getDeptType());
|
||||||
return sysDepts;
|
return sysDepts;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
public AllOrderInfoVo getIndexData4Pos(){
|
||||||
|
return allOrderInfoMapper.getIndexData4Pos(new AllOrderInfoDto());
|
||||||
|
}
|
||||||
|
|
||||||
|
// 获取经营数据
|
||||||
|
public AllOrderInfoVo getOperatingDataPos(){
|
||||||
|
return allOrderInfoMapper.getIndexData4Pos(new AllOrderInfoDto());
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
private long dayCount(String beginTimeStr, String endTimeStr ) {
|
private long dayCount(String beginTimeStr, String endTimeStr ) {
|
||||||
// 将字符串表示的时间转换成 LocalDate 对象
|
// 将字符串表示的时间转换成 LocalDate 对象
|
||||||
DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy/M/d");
|
DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy/M/d");
|
||||||
|
@ -3,6 +3,7 @@ package com.fuint.system.dept.mapper;
|
|||||||
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
|
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
|
||||||
import com.baomidou.mybatisplus.core.metadata.IPage;
|
import com.baomidou.mybatisplus.core.metadata.IPage;
|
||||||
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
|
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
|
||||||
|
import com.fuint.business.order.vo.AllOrderInfoVo;
|
||||||
import com.fuint.system.dept.entity.SysDept;
|
import com.fuint.system.dept.entity.SysDept;
|
||||||
import com.fuint.system.dept.vo.SysDeptVo;
|
import com.fuint.system.dept.vo.SysDeptVo;
|
||||||
import org.apache.ibatis.annotations.Param;
|
import org.apache.ibatis.annotations.Param;
|
||||||
@ -121,4 +122,5 @@ public interface SysDeptMapper extends BaseMapper<SysDept>
|
|||||||
|
|
||||||
int updateStatusByList(@Param("list") List<SysDept> sysDeptsList);
|
int updateStatusByList(@Param("list") List<SysDept> sysDeptsList);
|
||||||
|
|
||||||
|
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user