czg_team
/
cashier-admin-java
7
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/zs'

This commit is contained in:
SongZhang 2024-07-09 10:54:12 +08:00
parent 507b4d4d9e faadcea62b
commit c86e28a363
3 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
eladmin-system/src/main/java/cn/ysk/cashier/cons/rest/TbConsInfoController.java
View File

@ -14,7 +14,6 @@ import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;
import io.swagger.annotations.*;
import java.io.IOException;
import java.util.List;
import javax.servlet.http.HttpServletResponse;
/**
@ -73,4 +72,4 @@ public class TbConsInfoController {
tbConsInfoService.stockInOut(resources);
return new ResponseEntity<>(HttpStatus.NO_CONTENT);
}
}
}

2
eladmin-system/src/main/java/cn/ysk/cashier/mybatis/mapper/TbMShopUserMapper.java
View File

@ -19,7 +19,7 @@ public interface TbMShopUserMapper extends BaseMapper<TbMShopUser> {
"SELECT " +
"COUNT(*) userTotal, " +
"ifnull(SUM( " +
"IFNULL( b.charge_amount, 0 )), 0) chageTotal\n" +
"IFNULL( b.charge_amount, 0 )), 0) chageTotal, ifnull(SUM( IFNULL( a.amount, 0 )), 0) balanceTotal " +
"FROM\n" +
"tb_shop_user AS a\n" +
"LEFT JOIN tb_user_info AS b ON a.user_id = b.id\n" +

2
eladmin-system/src/main/java/cn/ysk/cashier/mybatis/mapper/TbShopUserFlowMapper.java
View File

@ -24,7 +24,7 @@ public interface TbShopUserFlowMapper extends BaseMapper<TbShopUserFlow> {
*/
@Select("<script>" +
"SELECT IFNULL(SUM(uf.amount), 0) FROM tb_shop_user_flow as uf " +
"JOIN tb_shop_user su ON uf.shop_user_id = su.user_id " +
"JOIN tb_shop_user su ON uf.shop_user_id = su.id " +
"WHERE su.shop_id = #{shopId} " +
"AND uf.create_time BETWEEN #{startTime} AND #{endTime} " +
"AND uf.biz_code IN " +