clunt
/
ghy-all
1
0
Fork 0
Code Issues Pull Requests 1 Packages Projects Releases Wiki Activity

Compare commits

base: clunt:174b6031e9a55be25a33a2d8b2ab7fc97a39e4aa
Branches Tags
clunt:master
clunt:HEAD
clunt:old-version
clunt:multiple_refund
clunt:refund
...
compare: clunt:9df61f6a85ec8c8c505a29e069c4bcc8738a8448
Branches Tags
clunt:master
clunt:HEAD
clunt:old-version
clunt:multiple_refund
clunt:refund

12 Commits
174b6031e9 ... 9df61f6a85

Author SHA1 Message Date
cb 9df61f6a85 修改列表查询 2025-04-30 21:57:34 +08:00
cb 21c4d8e7dc Merge remote-tracking branch 'origin/master' 2025-04-30 19:47:44 +08:00
cb 37471713b7 Merge remote-tracking branch 'origin/master' 2025-04-30 18:01:22 +08:00
cb f9080bb812 Merge remote-tracking branch 'origin/master' 2025-04-30 17:38:30 +08:00
cb 1be8d59c6f Merge remote-tracking branch 'origin/master' 2025-04-30 17:36:37 +08:00
cb 2e7bcaba70 Merge remote-tracking branch 'origin/master' 2025-04-30 17:14:35 +08:00
cb ff67462b73 Merge remote-tracking branch 'origin/master' 2025-04-30 16:53:49 +08:00
cb 2655d8ffdb Merge remote-tracking branch 'origin/master' 2025-04-30 14:50:13 +08:00
cb c92ea38c60 Merge remote-tracking branch 'origin/master' 2025-04-30 09:55:26 +08:00
cb fabfbad8e3 Reapply "no message" 
This reverts commit 63f85c996f.
 2025-04-30 09:38:05 +08:00
cb 63f85c996f Revert "no message" 
This reverts commit 45ee79cc6d.
 2025-04-30 09:37:36 +08:00
cb 45ee79cc6d no message 2025-04-30 09:35:46 +08:00
3 changed files with 4 additions and 1 deletions
Show Stats Expand all files Collapse all files

2
ghy-admin/src/main/java/com/ghy/web/controller/order/OrderMasterController.java
View File

@ -907,6 +907,8 @@ public class OrderMasterController extends BaseController {
@PostMapping("/app/count") @PostMapping("/app/count")
@ResponseBody @ResponseBody
public AjaxResult countAppList(@RequestBody OrderMaster orderMaster) { public AjaxResult countAppList(@RequestBody OrderMaster orderMaster) {
logger.info("传入的主单数据{}", orderMaster);
logger.info("获取到的主单数量{}", orderMasterService.countOrderMasterList(orderMaster));
return AjaxResult.success(orderMasterService.countOrderMasterList(orderMaster)); return AjaxResult.success(orderMasterService.countOrderMasterList(orderMaster));
} }

1
ghy-order/src/main/java/com/ghy/order/service/impl/OrderMasterServiceImpl.java
View File

@ -125,6 +125,7 @@ public class OrderMasterServiceImpl implements OrderMasterService {
@Override @Override
public Long countOrderMasterList(OrderMaster orderMaster) { public Long countOrderMasterList(OrderMaster orderMaster) {
return orderMasterMapper.countOrderMasterList(orderMaster); return orderMasterMapper.countOrderMasterList(orderMaster);
} }

2
ghy-order/src/main/resources/mapper/order/OrderMasterMapper.xml
View File

@ -132,7 +132,7 @@
om.goods_brand, om.goods_brand,
om.goods_specification, om.goods_specification,
om.consult_mode, om.consult_mode,
om.insurance_id om.insurance_id,
om.province_id, om.province_id,
om.city_id , om.city_id ,
om.country_id, om.country_id,