Browse Source

代码修改

LAPTOP-KB9HII50\70708 2 weeks ago
parent
commit
3563ab89e0

+ 7 - 1
business/base-service/pom.xml

@ -223,7 +223,13 @@
            <artifactId>jpush-client</artifactId>
            <version>3.4.8</version>
        </dependency>
        <dependency>
            <groupId>com.sfjswl</groupId>
            <artifactId>sftc-open-sdk-java</artifactId>
            <version>1</version>
            <scope>system</scope>
            <systemPath>${basedir}/src/main/lib/sftc-open-sdk-java-1.0.0.jar</systemPath>
        </dependency>
    </dependencies>
    <build>
        <resources>

File diff suppressed because it is too large
+ 168 - 9
business/base-service/src/main/java/com/yihu/jw/hospital/prescription/service/entrance/util/SFUtils.java


BIN
business/base-service/src/main/lib/sftc-open-sdk-java-1.0.0.jar


+ 2 - 2
business/base-service/src/mqConfig/mqdata/BS15018.json

@ -18,8 +18,8 @@
		"OP_DATE": "2014-07-25 08:46:40",
		"CARD_TYPE": "2",
		"CARD_TYPE_NAME": "社保卡",
		"social_no": "350211198411053024",
		"name":"白海灵",
		"social_no": "110101199908054376",
		"name":"姜云",
		"phone_no":null
	},
	{

+ 23 - 2
svr/svr-internet-hospital/src/main/java/com/yihu/jw/hospital/endpoint/prescription/PrescriptionEndpoint.java

@ -18,7 +18,6 @@ import com.yihu.jw.entity.base.area.BaseTownDO;
import com.yihu.jw.entity.base.doctor.BaseDoctorDO;
import com.yihu.jw.entity.base.im.ConsultDo;
import com.yihu.jw.entity.hospital.consult.WlyyHospitalSysDictDO;
import com.yihu.jw.entity.hospital.healthCare.YlzMedicalRelationDO;
import com.yihu.jw.entity.hospital.message.SystemMessageDO;
import com.yihu.jw.entity.hospital.prescription.*;
import com.yihu.jw.entity.order.BusinessOrderDO;
@ -30,6 +29,7 @@ import com.yihu.jw.hospital.prescription.dao.PrescriptionDiagnosisDao;
import com.yihu.jw.hospital.prescription.dao.PrescriptionInfoDao;
import com.yihu.jw.hospital.prescription.service.*;
import com.yihu.jw.hospital.prescription.service.entrance.*;
import com.yihu.jw.hospital.prescription.service.entrance.util.SFUtils;
import com.yihu.jw.hospital.service.SystemMessage.HospitalSystemMessageService;
import com.yihu.jw.hospital.service.consult.QrcodeService;
import com.yihu.jw.hospital.ykyy.service.YkyyService;
@ -52,7 +52,6 @@ import com.yihu.jw.wlyy.service.WlyyBusinessService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import io.swagger.annotations.ApiParam;
import io.swagger.models.auth.In;
import net.sf.json.xml.XMLSerializer;
import org.apache.commons.lang3.StringUtils;
import org.slf4j.Logger;
@ -169,6 +168,28 @@ public class PrescriptionEndpoint extends EnvelopRestEndpoint {
    private YkyyService ykyyService;
    @Autowired
    private QrcodeService qrcodeService;
    @Autowired
    private SFUtils sfUtils;
    @PostMapping(value = "sfCreateorder")
    @ApiOperation(value = "顺丰同城配送-下订单")
    public ObjEnvelop sfCreateorder() {
        try {
            return ObjEnvelop.getSuccess("success",sfUtils.createorder());
        } catch (Exception e) {
            return failedObjEnvelopException(e);
        }
    }
    @PostMapping(value = "sfCancelorder")
    @ApiOperation(value = "顺丰同城配送-取消订单")
    public ObjEnvelop cancelorder(@ApiParam(name = "orderId", value = "顺丰订单号")
                                      @RequestParam(value = "orderId", required = true) String orderId) {
        try {
            return ObjEnvelop.getSuccess("success",sfUtils.cancelorder(orderId));
        } catch (Exception e) {
            return failedObjEnvelopException(e);
        }
    }
    @PostMapping(value = "updPrescriptionExpressage")
    @ApiOperation(value = "修改续方收货信息")