clinic-v2
/
server
6
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master'

This commit is contained in:
牛子源 2025-05-28 15:38:19 +08:00
parent 0ed30a1c65 6fea7b1099
commit 7c7f838082
3 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/main/java/com/syjiaer/clinic/server/controller/goods/GoodsController.java
View File

@ -102,9 +102,9 @@ public class GoodsController extends BaseController {
} }
/** /**
* 商品搜索 一键建档内的搜索 * 商品搜索 下单时的搜索
*/ */
@ApiOperation("商品搜索一键建档内的搜索") @ApiOperation("商品搜索 下单时的搜索")
@RequestMapping("search") @RequestMapping("search")
public Result<List<GoodsSearchVo>> search() { public Result<List<GoodsSearchVo>> search() {
Map<String, Object> parms = getParms(); Map<String, Object> parms = getParms();

2
src/main/java/com/syjiaer/clinic/server/mapper/charge/ChargeOrderMapper.java
View File

@ -19,7 +19,7 @@ import java.util.Map;
public interface ChargeOrderMapper extends BaseMapper<ChargeOrder> { public interface ChargeOrderMapper extends BaseMapper<ChargeOrder> {
@Select("select * from charge_order where code = #{code}") @Select("select * from charge_order where code = #{code}")
ChargeOrder selectByCode(String code); ChargeOrder selectByCode(String code);
@Select("SELECT sale_person_id,pay_type,sum(total_price) ,count(1) FROM charge_order GROUP BY sale_person_id,pay_type") @Select("SELECT sale_person_id,pay_type,sum(total_price) as total ,count(1) as count FROM charge_order where status = 1 GROUP BY sale_person_id,pay_type")
List<Map<String, Object>> selectSaleReport(); List<Map<String, Object>> selectSaleReport();
} }

14
src/main/java/com/syjiaer/clinic/server/service/statistics/StatisticsService.java
View File

@ -156,10 +156,10 @@ public class StatisticsService extends BaseService {
vo.setSalePersonName(organizationMember.getName()); vo.setSalePersonName(organizationMember.getName());
} }
if (map.get("sum") == null){ if (map.get("total") == null){
continue; continue;
} }
vo.setTotalIncome(vo.getTotalIncome().add((BigDecimal) map.get("sum"))); vo.setTotalIncome(vo.getTotalIncome().add((BigDecimal) map.get("total")));
vo.setCount(vo.getCount()+(Long) map.get("count")); vo.setCount(vo.getCount()+(Long) map.get("count"));
RetailOrderPayTypeEnum payType = RetailOrderPayTypeEnum.getByCode((Integer) map.get("pay_type")); RetailOrderPayTypeEnum payType = RetailOrderPayTypeEnum.getByCode((Integer) map.get("pay_type"));
if (payType == null){ if (payType == null){
@ -167,19 +167,19 @@ public class StatisticsService extends BaseService {
} }
switch (payType) { switch (payType) {
case WXPAY: case WXPAY:
vo.setWechatIncome(vo.getWechatIncome().add((BigDecimal) map.get("sum"))); vo.setWechatIncome(vo.getWechatIncome().add((BigDecimal) map.get("total")));
break; break;
case ALIPAY: case ALIPAY:
vo.setAliPayIncome(vo.getAliPayIncome().add((BigDecimal) map.get("sum"))); vo.setAliPayIncome(vo.getAliPayIncome().add((BigDecimal) map.get("total")));
break; break;
case CASH: case CASH:
vo.setCashIncome(vo.getCashIncome().add((BigDecimal) map.get("sum"))); vo.setCashIncome(vo.getCashIncome().add((BigDecimal) map.get("total")));
break; break;
case OTHER: case OTHER:
vo.setOtherIncome(vo.getOtherIncome().add((BigDecimal) map.get("sum"))); vo.setOtherIncome(vo.getOtherIncome().add((BigDecimal) map.get("total")));
break; break;
case MEDICARE: case MEDICARE:
vo.setSocialIncome(vo.getSocialIncome().add((BigDecimal) map.get("sum"))); vo.setSocialIncome(vo.getSocialIncome().add((BigDecimal) map.get("total")));
break; break;
default: default:
break; break;