顺丰快递相关接口修改

patient-co/patient-co-wlyy/src/main/java/com/yihu/wlyy/web/patient/express/SFExpressController.java

@@ -9,6 +9,7 @@ import com.yihu.wlyy.web.BaseController;
import io.swagger.annotations.Api;
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;
@@ -86,12 +87,16 @@ public class SFExpressController extends BaseController {
            if(sfexpress_obj == null){
                return write(-1, "顺丰快递下单失败，未找到该处方的派送地址！");
            }
            //先判断地址是否可派送
            boolean delivery = sfexpressService.getSFOrderFilterService(sfexpress_obj.getProvinceName()+sfexpress_obj.getCityName()+sfexpress_obj.getTownName()+sfexpress_obj.getAddress());
            if(delivery){
            }else{
                //如果该处方的快递单号已生成，则说明已经下单成功，不需要重复下单，直接返回成功
                if(StringUtils.isNotBlank(sfexpress_obj.getMailno())){
                    return write(200, "顺丰快递下单成功！");
                }else{
                //如果该处方的快递单号未生成，则继续下单
                    //先判断地址是否可派送
                    boolean delivery = sfexpressService.getSFOrderFilterService(sfexpress_obj.getProvinceName()+sfexpress_obj.getCityName()+sfexpress_obj.getTownName()+sfexpress_obj.getAddress());
                    if(delivery){
//                sfexpress_obj.setCode("SF"+UUID.randomUUID().toString().replace("-",""));
//                sfexpress_obj.setPrescriptionCode(prescriptionCode);
//                sfexpress_obj.setName(sfexpress_obj.getName());
@@ -105,15 +110,17 @@ public class SFExpressController extends BaseController {
//                sfexpress_obj.setOneselfPickupFlg(0);//是否自取 1是 0否
//                sfexpress_obj.setCreateTime(DateUtil.getNowDate());
                //请求顺丰接口下单，成功下单后，返回快递单号
                sfexpress_obj = sfexpressService.postSFOrderService(sfexpress_obj);
                        //请求顺丰接口下单，成功下单后，返回快递单号
                        sfexpress_obj = sfexpressService.postSFOrderService(sfexpress_obj);
                //保存快递单号和增加处方物流记录为配送
                prescriptionExpressageService.updatePrescriptionExpressage(sfexpress_obj,getUID());
                        //保存快递单号和增加处方物流记录为配送
                        prescriptionExpressageService.updatePrescriptionExpressage(sfexpress_obj,getUID());
                return write(200, "顺丰快递下单成功！");
            }else{
                return write(-1, "顺丰快递下单失败，地址不可派送！");
                        return write(200, "顺丰快递下单成功！");
                    }else{
                        return write(-1, "顺丰快递下单失败，地址不可派送！");
                    }
                }
            }
        }catch (Exception e){
            //日志文件中记录异常信息