|
@ -17,11 +17,7 @@ import io.swagger.annotations.ApiOperation;
|
|
|
import io.swagger.annotations.ApiParam;
|
|
|
import org.apache.commons.lang.StringUtils;
|
|
|
import org.springframework.beans.factory.annotation.Autowired;
|
|
|
import org.springframework.stereotype.Controller;
|
|
|
import org.springframework.web.bind.annotation.RequestMapping;
|
|
|
import org.springframework.web.bind.annotation.RequestMethod;
|
|
|
import org.springframework.web.bind.annotation.RequestParam;
|
|
|
import org.springframework.web.bind.annotation.ResponseBody;
|
|
|
import org.springframework.web.bind.annotation.*;
|
|
|
|
|
|
import java.util.List;
|
|
|
|
|
@ -30,10 +26,10 @@ import java.util.List;
|
|
|
* Created by huangwenjie on 2017/8/16.
|
|
|
*/
|
|
|
|
|
|
@Controller
|
|
|
@RestController
|
|
|
@RequestMapping(value = "/doctor/sfexpress")
|
|
|
@Api(description = "顺丰速运相关接口")
|
|
|
public class SFExpressController extends BaseController {
|
|
|
@Api(description = "医生端顺丰速运相关接口")
|
|
|
public class DoctorSFExpressController extends BaseController {
|
|
|
|
|
|
@Autowired
|
|
|
private SFExpressService sfexpressService;
|
|
@ -48,7 +44,6 @@ public class SFExpressController extends BaseController {
|
|
|
private PrescriptionExpressageLogService prescriptionExpressageLogService;
|
|
|
|
|
|
@RequestMapping(value = "/sforderfilterservice", method = RequestMethod.GET)
|
|
|
@ResponseBody
|
|
|
@ApiOperation("查询派送地址是否属于顺丰的派送范围")
|
|
|
public String SFOrderFilterService(
|
|
|
@ApiParam(name = "d_address", value = "派送地址", defaultValue = "福建省厦门市思明区软件园二期望海路55号")
|
|
@ -72,7 +67,6 @@ public class SFExpressController extends BaseController {
|
|
|
}
|
|
|
|
|
|
@RequestMapping(value="/sforderservice",method = RequestMethod.POST)
|
|
|
@ResponseBody
|
|
|
@ApiOperation("向顺丰快递下订单")
|
|
|
@ObserverRequired
|
|
|
public String SFOrderService(
|
|
@ -87,7 +81,7 @@ public class SFExpressController extends BaseController {
|
|
|
if(StringUtils.isNotBlank(sfexpress_obj.getMailno())){
|
|
|
return write(200, "顺丰快递下单成功!");
|
|
|
}else{
|
|
|
//如果该处方的快递单号未生成,则继续下单
|
|
|
//如果该处方的快递单号未生成,则继续下单
|
|
|
|
|
|
//由于下单前已经判断过是否派送,这里不再重复判断----huangwenjie-2017.08.04
|
|
|
//先判断地址是否可派送boolean delivery = sfexpressService.getSFOrderFilterService(sfexpress_obj.getProvinceName()+sfexpress_obj.getCityName()+sfexpress_obj.getTownName()+sfexpress_obj.getAddress());
|
|
@ -115,7 +109,6 @@ public class SFExpressController extends BaseController {
|
|
|
}
|
|
|
|
|
|
@RequestMapping(value="/sfrouteservice",method = RequestMethod.POST)
|
|
|
@ResponseBody
|
|
|
@ApiOperation("通过处方编码查询顺丰物流派送记录")
|
|
|
@ObserverRequired
|
|
|
public String SFRouteService(
|
|
@ -143,7 +136,6 @@ public class SFExpressController extends BaseController {
|
|
|
}
|
|
|
|
|
|
@RequestMapping(value = "/getsfexpressprice", method = RequestMethod.GET)
|
|
|
@ResponseBody
|
|
|
@ApiOperation("根据收寄地址获取快递费用")
|
|
|
public String SFExpressPrice(
|
|
|
// @ApiParam(name = "j_city", value = "寄方地址(城市),默认为厦门", defaultValue = "厦门")
|
|
@ -167,7 +159,6 @@ public class SFExpressController extends BaseController {
|
|
|
}
|
|
|
|
|
|
@RequestMapping(value="/sfordersearchservice",method = RequestMethod.GET)
|
|
|
@ResponseBody
|
|
|
@ApiOperation("通过处方编码查询顺丰快递是否下单成功")
|
|
|
public String SFOrderSearchService(
|
|
|
@ApiParam(name="prescriptionCode", value="处方编号") @RequestParam(value = "prescriptionCode",required = true) String prescriptionCode){
|
|
@ -184,7 +175,6 @@ public class SFExpressController extends BaseController {
|
|
|
}
|
|
|
|
|
|
@RequestMapping(value="/sfgetorderinfoservice",method = RequestMethod.GET)
|
|
|
@ResponseBody
|
|
|
@ApiOperation("通过处方编码查询顺丰快递单信息(不包含物流记录)")
|
|
|
public String SFGetOrderInfo(
|
|
|
@ApiParam(name="prescriptionCode", value="处方编号") @RequestParam(value = "prescriptionCode",required = true) String prescriptionCode){
|