Merge branch 'dev' of huangwenjie/patient-co-management into dev

patient-co/patient-co-wlyy/src/main/java/com/yihu/wlyy/service/app/prescription/PrescriptionExpressageService.java

@@ -101,12 +101,12 @@ public class PrescriptionExpressageService {
    }
    /**
     * 保存处方物流记录
     * 保存快递单号和增加处方物流记录为配送
     * @param prescriptionExpressage
     * @param uid
     * @throws Exception
     */
    public void addPrescriptionExpressage(PrescriptionExpressage prescriptionExpressage, String uid)throws Exception{
    public void updatePrescriptionExpressage(PrescriptionExpressage prescriptionExpressage, String uid)throws Exception{
        //保存处方物流记录
        prescriptionExpressageDao.save(prescriptionExpressage);

patient-co/patient-co-wlyy/src/main/java/com/yihu/wlyy/util/SFUtils.java

@@ -7,12 +7,15 @@ import org.apache.commons.lang.StringUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.stereotype.Component;
import sun.misc.BASE64Encoder;
import java.util.List;
/**
 * 顺丰速递接口相关的一些公用方法
 * @author huangwenjie 2017.8.2
 */
@Component
public class SFUtils {

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

@@ -62,7 +62,7 @@ public class SFExpressController extends BaseController {
    @ResponseBody
    @ApiOperation("向顺丰快递下订单")
    public String SFOrderService(
            @ApiParam(name="prescriptionCode", value="订单编号(处方编号)") @RequestParam(value = "prescriptionCode",required = true) String prescriptionCode
            @ApiParam(name="prescriptionCode", value="处方编号") @RequestParam(value = "prescriptionCode",required = true) String prescriptionCode
//            @ApiParam(name="j_company", value="寄件方公司名称") @RequestParam(value = "j_company") String j_company,
//            @ApiParam(name="j_contact", value="寄件方联系人") @RequestParam(value = "j_contact") String j_contact,
//            @ApiParam(name="j_tel", value="寄件方联系电话") @RequestParam(value = "j_tel") String j_tel,
@@ -88,9 +88,9 @@ public class SFExpressController extends BaseController {
                return write(-1, "顺丰快递下单失败，未找到该处方的派送地址！");
            }
            //先判断地址是否可派送
            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);
@@ -108,8 +108,8 @@ public class SFExpressController extends BaseController {
                //请求顺丰接口下单，成功下单后，返回快递单号
                sfexpress_obj = sfexpressService.postSFOrderService(sfexpress_obj);
                //保存处方物流记录
                prescriptionExpressageService.addPrescriptionExpressage(sfexpress_obj,getUID());
                //保存快递单号和增加处方物流记录为配送
                prescriptionExpressageService.updatePrescriptionExpressage(sfexpress_obj,getUID());
                return write(200, "顺丰快递下单成功！");
            }else{
@@ -123,5 +123,18 @@ public class SFExpressController extends BaseController {
        }
    }
    @RequestMapping(value="/SFOrderService",method = RequestMethod.POST)
    @ResponseBody
    @ApiOperation("通过快递单号或者业务订单号查询包裹路由信息")
    public String SFRouteService(
            @ApiParam(name="tracking_number", value="快递单号或者订单编号") @RequestParam(value = "tracking_number",required = true) String tracking_number,
            @ApiParam(name="tracking_type", value="查询号类别：1为快递单号，2为订单编号") @RequestParam(value = "tracking_type",required = true) Integer tracking_type){
            //1.先从本地获取
        return "";
    }
}

patient-co/patient-co-wlyy/src/main/resources/application.yml

@@ -161,6 +161,12 @@ ylzpay:
  onepayAppId: 1BGKM1UHM03P7B2CA8C000005626EB0E
  onepayAppSecret: 1BGKM1UHM03I7B2CA8C00000AB682E9A
express:
  sf_url: http://bsp-ois.sit.sf-express.com:9080/bsp-ois/sfexpressService
#  sf_url: https://bsp-ois.sit.sf-express.com:9443/bsp-ois/sfexpressServic
  sf_code: BSPdevelop
  sf_check_word: j8DzkIFgmlomPt0aLuwU
---
##正式的配置
@@ -252,6 +258,12 @@ ylzpay:
  onepayAppId: 1BLF5SEGN00087165F0A000027362BE5
  onepayAppSecret: 1BLF5SCBO01V3E78A8C00000F3A0FFE7
express:
  sf_url: http://bsp-ois.sit.sf-express.com:9080/bsp-ois/sfexpressService
#  sf_url: https://bsp-ois.sit.sf-express.com:9443/bsp-ois/sfexpressServic
  sf_code: BSPdevelop
  sf_check_word: j8DzkIFgmlomPt0aLuwU
---
##开发的配置
spring:
@@ -342,6 +354,12 @@ ylzpay:
  onepayAppId: 1BGKM1UHM03P7B2CA8C000005626EB0E
  onepayAppSecret: 1BGKM1UHM03I7B2CA8C00000AB682E9A
express:
  sf_url: http://bsp-ois.sit.sf-express.com:9080/bsp-ois/sfexpressService
#  sf_url: https://bsp-ois.sit.sf-express.com:9443/bsp-ois/sfexpressServic
  sf_code: BSPdevelop
  sf_check_word: j8DzkIFgmlomPt0aLuwU
---
##开发连测试用这个版本的配置
spring:
@@ -421,4 +439,10 @@ sign:
quartz:
  name: schedulerFactoryBean_test_dev
  name: schedulerFactoryBean_test_dev
express:
  sf_url: http://bsp-ois.sit.sf-express.com:9080/bsp-ois/sfexpressService
#  sf_url: https://bsp-ois.sit.sf-express.com:9443/bsp-ois/sfexpressServic
  sf_code: BSPdevelop
  sf_check_word: j8DzkIFgmlomPt0aLuwU