|
@@ -2547,10 +2547,7 @@ public class ApiController {
|
|
// 查询适配, 普通药店和连锁药房统一返回33
|
|
// 查询适配, 普通药店和连锁药房统一返回33
|
|
if ("3".equals(userSign.getSignEntType())) {
|
|
if ("3".equals(userSign.getSignEntType())) {
|
|
// 根据药店类型 区分任务类型33-普通药店/73-连锁药房
|
|
// 根据药店类型 区分任务类型33-普通药店/73-连锁药房
|
|
- WmDaPharmacy daPharmacy = wmDaPharmacyService.getOne(Wrappers.<WmDaPharmacy>lambdaQuery()
|
|
|
|
- .eq(WmDaPharmacy::getPharmacyName, userSign.getSignEntName())
|
|
|
|
- .eq(WmDaPharmacy::getDelFlag, DelEnum.NOT_DEL.val())
|
|
|
|
- .eq(WmDaPharmacy::getEnableFlag, EnableEnum.ENABLE.val()));
|
|
|
|
|
|
+ WmDaPharmacy daPharmacy = wmDaPharmacyService.getById(userSign.getSignEntId());
|
|
if (daPharmacy == null) {
|
|
if (daPharmacy == null) {
|
|
throw new BizException("药店不存在或已停用");
|
|
throw new BizException("药店不存在或已停用");
|
|
}
|
|
}
|
|
@@ -3072,6 +3069,10 @@ public class ApiController {
|
|
List<WmScorePackageStatus> statusList = wmScorePackageStatusService.
|
|
List<WmScorePackageStatus> statusList = wmScorePackageStatusService.
|
|
list(Wrappers.query(wmScorePackageStatus));
|
|
list(Wrappers.query(wmScorePackageStatus));
|
|
|
|
|
|
|
|
+ if (CollUtil.isEmpty(statusList)) {
|
|
|
|
+ return R.ok(Collections.emptyList());
|
|
|
|
+ }
|
|
|
|
+
|
|
List<Map<String, Object>> listMap = new ArrayList<>();
|
|
List<Map<String, Object>> listMap = new ArrayList<>();
|
|
|
|
|
|
// 获取领包记录对应的积分包ID && 获取积分包信息
|
|
// 获取领包记录对应的积分包ID && 获取积分包信息
|