|
@@ -1,6 +1,7 @@
|
|
package com.ywt.mg.services;
|
|
package com.ywt.mg.services;
|
|
|
|
|
|
import com.ywt.mg.core.utils.Checker;
|
|
import com.ywt.mg.core.utils.Checker;
|
|
|
|
+import com.ywt.mg.core.utils.CheckerPharmacyUtil;
|
|
import com.ywt.mg.core.utils.DateUtil;
|
|
import com.ywt.mg.core.utils.DateUtil;
|
|
import com.ywt.mg.domain.models.ConstantDef;
|
|
import com.ywt.mg.domain.models.ConstantDef;
|
|
import com.ywt.mg.domain.models.enums.*;
|
|
import com.ywt.mg.domain.models.enums.*;
|
|
@@ -94,6 +95,9 @@ public class CommonServices {
|
|
if (p.getPharmacyId() == ConstantDef.GK_PHARMACY_ID && p.getPaymentStatus() == PaymentStatusEnum.Success.getValue()) {
|
|
if (p.getPharmacyId() == ConstantDef.GK_PHARMACY_ID && p.getPaymentStatus() == PaymentStatusEnum.Success.getValue()) {
|
|
return "待取药";
|
|
return "待取药";
|
|
}
|
|
}
|
|
|
|
+ if(CheckerPharmacyUtil.checkAdverPresPharmacyId(p.getPharmacyId()) && p.getPaymentStatus() == PaymentStatusEnum.Success.getValue()){
|
|
|
|
+ return "待取药";
|
|
|
|
+ }
|
|
return statusStr;
|
|
return statusStr;
|
|
}
|
|
}
|
|
|
|
|