1.3.6.1

common/common-entity/src/main/java/com/yihu/wlyy/entity/patient/prescription/PrescriptionExpressage.java

@@ -72,6 +72,7 @@ public class PrescriptionExpressage extends IdEntity{
    private Date createTime;                //创建的时间
    private Integer del;    //1可用 0删除
    private Date deliveryTime; //送达时间
    public String getHospitalCode() {
        return hospitalCode;
@@ -415,4 +416,12 @@ public class PrescriptionExpressage extends IdEntity{
    public void setFetchingMedicineTime(Date fetchingMedicineTime) {
        this.fetchingMedicineTime = fetchingMedicineTime;
    }
    public Date getDeliveryTime() {
        return deliveryTime;
    }
    public void setDeliveryTime(Date deliveryTime) {
        this.deliveryTime = deliveryTime;
    }
}

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

@@ -37,6 +37,7 @@ import com.ylzinfo.onepay.sdk.domain.RequestParams;
import com.ylzinfo.onepay.sdk.domain.ResponseParams;
import com.ylzinfo.onepay.sdk.utils.DateUtil;
import com.ylzinfo.onepay.sdk.utils.StringUtil;
import org.apache.commons.lang3.StringUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
@@ -574,7 +575,7 @@ public class PatientPrescriptionPayService extends BaseService {
     * 长处方支付，成功则返回支付路径
     */
    @Transactional
    public Map charge(int type, String addressJson, String orgCode, String prescriptionCode, int totalAmount, String people, String accessToken, String returnUrl) throws Exception {
    public Map charge(int type, String addressJson, String orgCode, String prescriptionCode, int totalAmount, String people, String accessToken, String returnUrl,String deliveryTime) throws Exception {
        Map resultMap = new HashMap();
        Prescription prescription = null;
@@ -666,6 +667,10 @@ public class PatientPrescriptionPayService extends BaseService {
                expressage.setCreateTime(now);//创建时间
                expressage.setOneselfPickupFlg(1);//是否自取 1是 0否
                expressage.setDel(1);//有效
                if(StringUtils.isNotBlank(deliveryTime)){
                    Date dt = com.yihu.wlyy.util.DateUtil.stringToDate(deliveryTime,"yyyy-MM-dd");
                    expressage.setDeliveryTime(dt);
                }
                break;
            case 2:
                prescription.setDispensaryType(2);//取药类型:1 自取 2快递配送 3健管师配送
@@ -697,6 +702,11 @@ public class PatientPrescriptionPayService extends BaseService {
                expressage.setCreateTime(now);//创建时间
                expressage.setOneselfPickupFlg(0);//是否自取 1是 0否
                expressage.setDel(1);//有效
                //v1.3.6.1 新增deliveryTime
                if(StringUtils.isNotBlank(deliveryTime)){
                    Date dt = com.yihu.wlyy.util.DateUtil.stringToDate(deliveryTime,"yyyy-MM-dd");
                    expressage.setDeliveryTime(dt);
                }
                break;
            case 3:
                prescription.setDispensaryType(3);//取药类型:1 自取 2快递配送 3健管师配送
@@ -723,7 +733,11 @@ public class PatientPrescriptionPayService extends BaseService {
                expressage.setCreateTime(now);//创建时间
                expressage.setOneselfPickupFlg(0);//是否自取 1是 0否
                expressage.setDel(1);//有效
                //v1.3.6.1 新增deliveryTime
                if(StringUtils.isNotBlank(deliveryTime)){
                    Date dt = com.yihu.wlyy.util.DateUtil.stringToDate(deliveryTime,"yyyy-MM-dd");
                    expressage.setDeliveryTime(dt);
                }
                //根据居民code查询团队长及所在团队待处理订单数量
                String sql = "SELECT a.id teamCode,a.leader_code leaderCode,d.`name` leaderName " +
                        " FROM wlyy_sign_family t,wlyy_admin_team a,wlyy_doctor d " +

patient-co/patient-co-wlyy/src/main/java/com/yihu/wlyy/web/patient/prescription/PatientPrescriptionPayController.java

@@ -77,11 +77,12 @@ public class PatientPrescriptionPayController extends WeixinBaseController {
                    "\"冰岛\",\"cityName\":\"厦门市\",\"townCode\":\"350205\",\"provinceCode\":\"350000\",\"cityCode\":\"350200\",\"name\":\"海沧区嵩屿街道社区卫生服务中心\"," +
                    "\"provinceName\":\"福建省\",\"streeCode\":\"35020501\",\"streeName\":\"皇后大道东\",\"phone\":\"13253541190\"}") String addressJson,
            @RequestParam(required = true) @ApiParam(value = "页面回调地址", name = "returnUrl") String returnUrl,
            @RequestParam(required = true) @ApiParam(value = "订单总金额", name = "totalAmount") int totalAmount) throws Exception {
            @RequestParam(required = true) @ApiParam(value = "订单总金额", name = "totalAmount") int totalAmount,
            @RequestParam(required = false) @ApiParam(value = "送达时间", name = "deliveryTime") String deliveryTime) throws Exception {
        try {
            String accessToken = getAccessToken();
            String patient = getUID();
            Map result = payService.charge(type, addressJson, orgCode, prescriptionCode, totalAmount, patient, accessToken, returnUrl);
            Map result = payService.charge(type, addressJson, orgCode, prescriptionCode, totalAmount, patient, accessToken, returnUrl,deliveryTime);
            if ("-1".equals(result.get("status").toString())) {
                return error(-1, "续方居民信息与微信支付身份信息不一致！");
            } else if ("-2".equals(result.get("status").toString())) {