|
@@ -9,6 +9,7 @@ import com.fs.framework.security.LoginUser;
|
|
|
import com.fs.framework.service.TokenService;
|
|
import com.fs.framework.service.TokenService;
|
|
|
import com.fs.his.param.CollectionOrcParam;
|
|
import com.fs.his.param.CollectionOrcParam;
|
|
|
import com.fs.his.vo.CollectionOrcVO;
|
|
import com.fs.his.vo.CollectionOrcVO;
|
|
|
|
|
+import com.fs.hisStore.domain.FsStoreOrderScrm;
|
|
|
import org.springframework.beans.factory.annotation.Autowired;
|
|
import org.springframework.beans.factory.annotation.Autowired;
|
|
|
import org.springframework.web.bind.annotation.*;
|
|
import org.springframework.web.bind.annotation.*;
|
|
|
import com.fs.common.core.controller.BaseController;
|
|
import com.fs.common.core.controller.BaseController;
|
|
@@ -100,7 +101,11 @@ public class HandwriteCollectionController extends BaseController
|
|
|
if (StringUtils.isBlank(orderCode)){
|
|
if (StringUtils.isBlank(orderCode)){
|
|
|
return AjaxResult.error("订单号不能为空");
|
|
return AjaxResult.error("订单号不能为空");
|
|
|
}
|
|
}
|
|
|
- return AjaxResult.success(handwriteCollectionService.getOrderCodeInfo(orderCode));
|
|
|
|
|
|
|
+ FsStoreOrderScrm orderCodeInfo = handwriteCollectionService.getOrderCodeInfo(orderCode);
|
|
|
|
|
+ if (orderCodeInfo == null){
|
|
|
|
|
+ return AjaxResult.error("商城订单不存在");
|
|
|
|
|
+ }
|
|
|
|
|
+ return AjaxResult.success(orderCodeInfo);
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
/**
|
|
/**
|