|
@@ -29,6 +29,8 @@ import com.fs.hisStore.param.*;
|
|
|
import com.fs.hisStore.service.*;
|
|
import com.fs.hisStore.service.*;
|
|
|
import com.fs.hisStore.vo.FsMyStoreOrderListQueryVO;
|
|
import com.fs.hisStore.vo.FsMyStoreOrderListQueryVO;
|
|
|
import com.fs.hisStore.vo.FsStoreOrderItemVO;
|
|
import com.fs.hisStore.vo.FsStoreOrderItemVO;
|
|
|
|
|
+import com.fs.hospital580.entity.Hospital580PrescriptionScrmEntity;
|
|
|
|
|
+import com.fs.hospital580.service.Hospital580PrescriptionScrmService;
|
|
|
import com.fs.huifuPay.domain.HuiFuCreateOrder;
|
|
import com.fs.huifuPay.domain.HuiFuCreateOrder;
|
|
|
import com.fs.huifuPay.domain.HuifuCreateOrderResult;
|
|
import com.fs.huifuPay.domain.HuifuCreateOrderResult;
|
|
|
import com.fs.huifuPay.service.HuiFuService;
|
|
import com.fs.huifuPay.service.HuiFuService;
|
|
@@ -118,6 +120,8 @@ public class StoreOrderScrmController extends AppBaseController {
|
|
|
@Qualifier("k9OrderScrmServiceImpl")
|
|
@Qualifier("k9OrderScrmServiceImpl")
|
|
|
private IErpOrderService k9OrderService;
|
|
private IErpOrderService k9OrderService;
|
|
|
|
|
|
|
|
|
|
+ @Autowired
|
|
|
|
|
+ private Hospital580PrescriptionScrmService orderScrmService;
|
|
|
@Autowired
|
|
@Autowired
|
|
|
private ConfigUtil configUtil;
|
|
private ConfigUtil configUtil;
|
|
|
//TODO 应该没用到
|
|
//TODO 应该没用到
|
|
@@ -204,6 +208,11 @@ public class StoreOrderScrmController extends AppBaseController {
|
|
|
FsPrescribeScrm prescribe=null;
|
|
FsPrescribeScrm prescribe=null;
|
|
|
if(order.getPrescribeId()!=null){
|
|
if(order.getPrescribeId()!=null){
|
|
|
prescribe=prescribeService.selectFsPrescribeById(order.getPrescribeId());
|
|
prescribe=prescribeService.selectFsPrescribeById(order.getPrescribeId());
|
|
|
|
|
+ if (ObjectUtil.isEmpty(prescribe)){
|
|
|
|
|
+ Hospital580PrescriptionScrmEntity byId = orderScrmService.getById(order.getPrescribeId());
|
|
|
|
|
+ prescribe = new FsPrescribeScrm();
|
|
|
|
|
+ prescribe.setPatientId(byId.getPreId());
|
|
|
|
|
+ }
|
|
|
}
|
|
}
|
|
|
//处理是否可以申请售后
|
|
//处理是否可以申请售后
|
|
|
Integer isAfterSales=0;
|
|
Integer isAfterSales=0;
|