下单新增收件地址

chenjiahe

2023-12-26 5c0db740d71483e3bc43dd593a0c3f3bce193b26

下单新增收件地址

 phi_platform_common/src/main/java/com/hx/phip/AutoDomeUtil.java

@@ -42,7 +42,7 @@
        urlData.serviceImplUrlData(controllerPackRoot,packageName + ".service.impl");
        urlData.mapperUrlData(commonPackRootResourse, "mapper.platform");

        Class<?> clas = OrderItemSon.class;
        Class<?> clas = OrderInfo.class;
        //dao
         GeneratorUtil.generatorDao(clas,urlData);
        //mapper

 phi_platform_common/src/main/resources/mapper/platform/OrderInfoMapper.xml

@@ -8,7 +8,7 @@
    <!-- 整个实体类修改，表字段=实体类字段-->
    <sql id="Update_Column_All">
        <trim prefixOverrides=",">
            ,orderId = #{orderId},payNo = #{payNo},buyNum = #{buyNum},activityId = #{activityId},activityName = #{activityName},isWholeDiscount = #{isWholeDiscount},isEmployeeDiscount = #{isEmployeeDiscount},discount = #{discount},snapPayTotal = #{snapPayTotal},snapExecuteTotal = #{snapExecuteTotal},hisOrderNo = #{hisOrderNo},inviteeType = #{inviteeType},inviteeId = #{inviteeId},inviteeNo = #{inviteeNo},inviteeCIQ = #{inviteeCIQ},inviteeName = #{inviteeName},userShopId = #{userShopId},userShopNo = #{userShopNo},userShopName = #{userShopName},userStatus = #{userStatus},hisCorpUserId = #{hisCorpUserId},hisCorpUserName = #{hisCorpUserName},doctorCorpUserId = #{doctorCorpUserId},doctorCorpUserName = #{doctorCorpUserName},nurseCorpUserId = #{nurseCorpUserId},nurseCorpUserName = #{nurseCorpUserName},internetCorpUserId = #{internetCorpUserId},internetCorpUserName = #{internetCorpUserName},memberLevelId = #{memberLevelId},memberLevelName = #{memberLevelName},channelId = #{channelId},channelName = #{channelName},channel2Id = #{channel2Id},channelName2 = #{channelName2},channelCategory = #{channelCategory},channelAssistId = #{channelAssistId},channelAssistName = #{channelAssistName},channelAssist2Id = #{channelAssist2Id},channelAssist2Name = #{channelAssist2Name},channelAssist2Json = #{channelAssist2Json},isOldBringNew = #{isOldBringNew},isCustomerConfirm = #{isCustomerConfirm},isBothTheOne = #{isBothTheOne},isBothTheOneInitial = #{isBothTheOneInitial},bothTheOneTime = #{bothTheOneTime},applyId = #{applyId},prescriptionNo = #{prescriptionNo},prescriptionId = #{prescriptionId},orderOCRImageUrl = #{orderOCRImageUrl},otherOrderNo = #{otherOrderNo},redemptionCode = #{redemptionCode},relationType = #{relationType},relationId = #{relationId},relationName = #{relationName},isDel = #{isDel},createTime = #{createTime},editTime = #{editTime}
            ,orderId = #{orderId},payNo = #{payNo},buyNum = #{buyNum},activityId = #{activityId},activityName = #{activityName},isWholeDiscount = #{isWholeDiscount},isEmployeeDiscount = #{isEmployeeDiscount},discount = #{discount},snapPayTotal = #{snapPayTotal},snapExecuteTotal = #{snapExecuteTotal},hisOrderNo = #{hisOrderNo},inviteeType = #{inviteeType},inviteeId = #{inviteeId},inviteeNo = #{inviteeNo},inviteeCIQ = #{inviteeCIQ},inviteeName = #{inviteeName},userShopId = #{userShopId},userShopNo = #{userShopNo},userShopName = #{userShopName},userStatus = #{userStatus},hisCorpUserId = #{hisCorpUserId},hisCorpUserName = #{hisCorpUserName},doctorCorpUserId = #{doctorCorpUserId},doctorCorpUserName = #{doctorCorpUserName},nurseCorpUserId = #{nurseCorpUserId},nurseCorpUserName = #{nurseCorpUserName},internetCorpUserId = #{internetCorpUserId},internetCorpUserName = #{internetCorpUserName},memberLevelId = #{memberLevelId},memberLevelName = #{memberLevelName},channelId = #{channelId},channelName = #{channelName},channel2Id = #{channel2Id},channelName2 = #{channelName2},channelCategory = #{channelCategory},channelAssistId = #{channelAssistId},channelAssistName = #{channelAssistName},channelAssist2Id = #{channelAssist2Id},channelAssist2Name = #{channelAssist2Name},channelAssist2Json = #{channelAssist2Json},isOldBringNew = #{isOldBringNew},isCustomerConfirm = #{isCustomerConfirm},isBothTheOne = #{isBothTheOne},isBothTheOneInitial = #{isBothTheOneInitial},bothTheOneTime = #{bothTheOneTime},applyId = #{applyId},prescriptionNo = #{prescriptionNo},prescriptionId = #{prescriptionId},orderOCRImageUrl = #{orderOCRImageUrl},otherOrderNo = #{otherOrderNo},redemptionCode = #{redemptionCode},relationType = #{relationType},relationId = #{relationId},relationName = #{relationName},linkMan = #{linkMan},linkTel = #{linkTel},province = #{province},city = #{city},area = #{area},street = #{street},addrDetail = #{addrDetail},isDel = #{isDel},createTime = #{createTime},editTime = #{editTime}
        </trim>
    </sql>
     
@@ -19,11 +19,11 @@
        <selectKey keyProperty="id" resultType="String" order="BEFORE">
               select replace(uuid(),'-','') from dual
        </selectKey>
        insert into orders_info (id,orderId,payNo,buyNum,activityId,activityName,isWholeDiscount,isEmployeeDiscount,discount,snapPayTotal,snapExecuteTotal,hisOrderNo,inviteeType,inviteeId,inviteeNo,inviteeCIQ,inviteeName,userShopId,userShopNo,userShopName,userStatus,hisCorpUserId,hisCorpUserName,doctorCorpUserId,doctorCorpUserName,nurseCorpUserId,nurseCorpUserName,internetCorpUserId,internetCorpUserName,memberLevelId,memberLevelName,channelId,channelName,channel2Id,channelName2,channelCategory,channelAssistId,channelAssistName,channelAssist2Id,channelAssist2Name,channelAssist2Json,isOldBringNew,isCustomerConfirm,isBothTheOne,isBothTheOneInitial,bothTheOneTime,applyId,prescriptionNo,prescriptionId,orderOCRImageUrl,otherOrderNo,redemptionCode,relationType,relationId,relationName,isDel,createTime,editTime)  values (#{id},#{orderId},#{payNo},#{buyNum},#{activityId},#{activityName},#{isWholeDiscount},#{isEmployeeDiscount},#{discount},#{snapPayTotal},#{snapExecuteTotal},#{hisOrderNo},#{inviteeType},#{inviteeId},#{inviteeNo},#{inviteeCIQ},#{inviteeName},#{userShopId},#{userShopNo},#{userShopName},#{userStatus},#{hisCorpUserId},#{hisCorpUserName},#{doctorCorpUserId},#{doctorCorpUserName},#{nurseCorpUserId},#{nurseCorpUserName},#{internetCorpUserId},#{internetCorpUserName},#{memberLevelId},#{memberLevelName},#{channelId},#{channelName},#{channel2Id},#{channelName2},#{channelCategory},#{channelAssistId},#{channelAssistName},#{channelAssist2Id},#{channelAssist2Name},#{channelAssist2Json},#{isOldBringNew},#{isCustomerConfirm},#{isBothTheOne},#{isBothTheOneInitial},#{bothTheOneTime},#{applyId},#{prescriptionNo},#{prescriptionId},#{orderOCRImageUrl},#{otherOrderNo},#{redemptionCode},#{relationType},#{relationId},#{relationName},#{isDel},#{createTime},#{editTime})
        insert into orders_info (id,orderId,payNo,buyNum,activityId,activityName,isWholeDiscount,isEmployeeDiscount,discount,snapPayTotal,snapExecuteTotal,hisOrderNo,inviteeType,inviteeId,inviteeNo,inviteeCIQ,inviteeName,userShopId,userShopNo,userShopName,userStatus,hisCorpUserId,hisCorpUserName,doctorCorpUserId,doctorCorpUserName,nurseCorpUserId,nurseCorpUserName,internetCorpUserId,internetCorpUserName,memberLevelId,memberLevelName,channelId,channelName,channel2Id,channelName2,channelCategory,channelAssistId,channelAssistName,channelAssist2Id,channelAssist2Name,channelAssist2Json,isOldBringNew,isCustomerConfirm,isBothTheOne,isBothTheOneInitial,bothTheOneTime,applyId,prescriptionNo,prescriptionId,orderOCRImageUrl,otherOrderNo,redemptionCode,relationType,relationId,relationName,linkMan,linkTel,province,city,area,street,addrDetail,isDel,createTime,editTime)  values (#{id},#{orderId},#{payNo},#{buyNum},#{activityId},#{activityName},#{isWholeDiscount},#{isEmployeeDiscount},#{discount},#{snapPayTotal},#{snapExecuteTotal},#{hisOrderNo},#{inviteeType},#{inviteeId},#{inviteeNo},#{inviteeCIQ},#{inviteeName},#{userShopId},#{userShopNo},#{userShopName},#{userStatus},#{hisCorpUserId},#{hisCorpUserName},#{doctorCorpUserId},#{doctorCorpUserName},#{nurseCorpUserId},#{nurseCorpUserName},#{internetCorpUserId},#{internetCorpUserName},#{memberLevelId},#{memberLevelName},#{channelId},#{channelName},#{channel2Id},#{channelName2},#{channelCategory},#{channelAssistId},#{channelAssistName},#{channelAssist2Id},#{channelAssist2Name},#{channelAssist2Json},#{isOldBringNew},#{isCustomerConfirm},#{isBothTheOne},#{isBothTheOneInitial},#{bothTheOneTime},#{applyId},#{prescriptionNo},#{prescriptionId},#{orderOCRImageUrl},#{otherOrderNo},#{redemptionCode},#{relationType},#{relationId},#{relationName},#{linkMan},#{linkTel},#{province},#{city},#{area},#{street},#{addrDetail},#{isDel},#{createTime},#{editTime})
    </insert>

    <insert id="insertById" parameterType="com.hx.phiappt.model.order.OrderInfo">
        insert into orders_info (id,orderId,payNo,buyNum,activityId,activityName,isWholeDiscount,isEmployeeDiscount,discount,snapPayTotal,snapExecuteTotal,hisOrderNo,inviteeType,inviteeId,inviteeNo,inviteeCIQ,inviteeName,userShopId,userShopNo,userShopName,userStatus,hisCorpUserId,hisCorpUserName,doctorCorpUserId,doctorCorpUserName,nurseCorpUserId,nurseCorpUserName,internetCorpUserId,internetCorpUserName,memberLevelId,memberLevelName,channelId,channelName,channel2Id,channelName2,channelCategory,channelAssistId,channelAssistName,channelAssist2Id,channelAssist2Name,channelAssist2Json,isOldBringNew,isCustomerConfirm,isBothTheOne,isBothTheOneInitial,bothTheOneTime,applyId,prescriptionNo,prescriptionId,orderOCRImageUrl,otherOrderNo,redemptionCode,relationType,relationId,relationName,isDel,createTime,editTime)  values (#{id},#{orderId},#{payNo},#{buyNum},#{activityId},#{activityName},#{isWholeDiscount},#{isEmployeeDiscount},#{discount},#{snapPayTotal},#{snapExecuteTotal},#{hisOrderNo},#{inviteeType},#{inviteeId},#{inviteeNo},#{inviteeCIQ},#{inviteeName},#{userShopId},#{userShopNo},#{userShopName},#{userStatus},#{hisCorpUserId},#{hisCorpUserName},#{doctorCorpUserId},#{doctorCorpUserName},#{nurseCorpUserId},#{nurseCorpUserName},#{internetCorpUserId},#{internetCorpUserName},#{memberLevelId},#{memberLevelName},#{channelId},#{channelName},#{channel2Id},#{channelName2},#{channelCategory},#{channelAssistId},#{channelAssistName},#{channelAssist2Id},#{channelAssist2Name},#{channelAssist2Json},#{isOldBringNew},#{isCustomerConfirm},#{isBothTheOne},#{isBothTheOneInitial},#{bothTheOneTime},#{applyId},#{prescriptionNo},#{prescriptionId},#{orderOCRImageUrl},#{otherOrderNo},#{redemptionCode},#{relationType},#{relationId},#{relationName},#{isDel},#{createTime},#{editTime})
        insert into orders_info (id,orderId,payNo,buyNum,activityId,activityName,isWholeDiscount,isEmployeeDiscount,discount,snapPayTotal,snapExecuteTotal,hisOrderNo,inviteeType,inviteeId,inviteeNo,inviteeCIQ,inviteeName,userShopId,userShopNo,userShopName,userStatus,hisCorpUserId,hisCorpUserName,doctorCorpUserId,doctorCorpUserName,nurseCorpUserId,nurseCorpUserName,internetCorpUserId,internetCorpUserName,memberLevelId,memberLevelName,channelId,channelName,channel2Id,channelName2,channelCategory,channelAssistId,channelAssistName,channelAssist2Id,channelAssist2Name,channelAssist2Json,isOldBringNew,isCustomerConfirm,isBothTheOne,isBothTheOneInitial,bothTheOneTime,applyId,prescriptionNo,prescriptionId,orderOCRImageUrl,otherOrderNo,redemptionCode,relationType,relationId,relationName,linkMan,linkTel,province,city,area,street,addrDetail,isDel,createTime,editTime)  values (#{id},#{orderId},#{payNo},#{buyNum},#{activityId},#{activityName},#{isWholeDiscount},#{isEmployeeDiscount},#{discount},#{snapPayTotal},#{snapExecuteTotal},#{hisOrderNo},#{inviteeType},#{inviteeId},#{inviteeNo},#{inviteeCIQ},#{inviteeName},#{userShopId},#{userShopNo},#{userShopName},#{userStatus},#{hisCorpUserId},#{hisCorpUserName},#{doctorCorpUserId},#{doctorCorpUserName},#{nurseCorpUserId},#{nurseCorpUserName},#{internetCorpUserId},#{internetCorpUserName},#{memberLevelId},#{memberLevelName},#{channelId},#{channelName},#{channel2Id},#{channelName2},#{channelCategory},#{channelAssistId},#{channelAssistName},#{channelAssist2Id},#{channelAssist2Name},#{channelAssist2Json},#{isOldBringNew},#{isCustomerConfirm},#{isBothTheOne},#{isBothTheOneInitial},#{bothTheOneTime},#{applyId},#{prescriptionNo},#{prescriptionId},#{orderOCRImageUrl},#{otherOrderNo},#{redemptionCode},#{relationType},#{relationId},#{relationName},#{linkMan},#{linkTel},#{province},#{city},#{area},#{street},#{addrDetail},#{isDel},#{createTime},#{editTime})
    </insert>

    <select id="selectList" resultType="com.hx.phiappt.model.order.OrderInfo" parameterType="com.hx.mybatisTool.SqlSentence" >
@@ -55,14 +55,14 @@

    <select id="selectOneByKey" resultType="com.hx.phiappt.model.order.OrderInfo" parameterType="java.lang.Object" >
        select 
            id,orderId,payNo,buyNum,activityId,activityName,isWholeDiscount,isEmployeeDiscount,discount,snapPayTotal,snapExecuteTotal,hisOrderNo,inviteeType,inviteeId,inviteeNo,inviteeCIQ,inviteeName,userShopId,userShopNo,userShopName,userStatus,hisCorpUserId,hisCorpUserName,doctorCorpUserId,doctorCorpUserName,nurseCorpUserId,nurseCorpUserName,internetCorpUserId,internetCorpUserName,memberLevelId,memberLevelName,channelId,channelName,channel2Id,channelName2,channelCategory,channelAssistId,channelAssistName,channelAssist2Id,channelAssist2Name,channelAssist2Json,isOldBringNew,isCustomerConfirm,isBothTheOne,isBothTheOneInitial,bothTheOneTime,applyId,prescriptionNo,prescriptionId,orderOCRImageUrl,otherOrderNo,redemptionCode,relationType,relationId,relationName,isDel,createTime,editTime
            id,orderId,payNo,buyNum,activityId,activityName,isWholeDiscount,isEmployeeDiscount,discount,snapPayTotal,snapExecuteTotal,hisOrderNo,inviteeType,inviteeId,inviteeNo,inviteeCIQ,inviteeName,userShopId,userShopNo,userShopName,userStatus,hisCorpUserId,hisCorpUserName,doctorCorpUserId,doctorCorpUserName,nurseCorpUserId,nurseCorpUserName,internetCorpUserId,internetCorpUserName,memberLevelId,memberLevelName,channelId,channelName,channel2Id,channelName2,channelCategory,channelAssistId,channelAssistName,channelAssist2Id,channelAssist2Name,channelAssist2Json,isOldBringNew,isCustomerConfirm,isBothTheOne,isBothTheOneInitial,bothTheOneTime,applyId,prescriptionNo,prescriptionId,orderOCRImageUrl,otherOrderNo,redemptionCode,relationType,relationId,relationName,linkMan,linkTel,province,city,area,street,addrDetail,isDel,createTime,editTime
        from orders_info
        WHERE id = #{value}
    </select>

    <select id="selectOneByKeyBlob" resultType="com.hx.phiappt.model.order.OrderInfo" parameterType="java.lang.Object" >
        select 
            id,orderId,payNo,buyNum,activityId,activityName,isWholeDiscount,isEmployeeDiscount,discount,snapPayTotal,snapExecuteTotal,hisOrderNo,inviteeType,inviteeId,inviteeNo,inviteeCIQ,inviteeName,userShopId,userShopNo,userShopName,userStatus,hisCorpUserId,hisCorpUserName,doctorCorpUserId,doctorCorpUserName,nurseCorpUserId,nurseCorpUserName,internetCorpUserId,internetCorpUserName,memberLevelId,memberLevelName,channelId,channelName,channel2Id,channelName2,channelCategory,channelAssistId,channelAssistName,channelAssist2Id,channelAssist2Name,channelAssist2Json,isOldBringNew,isCustomerConfirm,isBothTheOne,isBothTheOneInitial,bothTheOneTime,applyId,prescriptionNo,prescriptionId,orderOCRImageUrl,otherOrderNo,redemptionCode,relationType,relationId,relationName,isDel,createTime,editTime
            id,orderId,payNo,buyNum,activityId,activityName,isWholeDiscount,isEmployeeDiscount,discount,snapPayTotal,snapExecuteTotal,hisOrderNo,inviteeType,inviteeId,inviteeNo,inviteeCIQ,inviteeName,userShopId,userShopNo,userShopName,userStatus,hisCorpUserId,hisCorpUserName,doctorCorpUserId,doctorCorpUserName,nurseCorpUserId,nurseCorpUserName,internetCorpUserId,internetCorpUserName,memberLevelId,memberLevelName,channelId,channelName,channel2Id,channelName2,channelCategory,channelAssistId,channelAssistName,channelAssist2Id,channelAssist2Name,channelAssist2Json,isOldBringNew,isCustomerConfirm,isBothTheOne,isBothTheOneInitial,bothTheOneTime,applyId,prescriptionNo,prescriptionId,orderOCRImageUrl,otherOrderNo,redemptionCode,relationType,relationId,relationName,linkMan,linkTel,province,city,area,street,addrDetail,isDel,createTime,editTime
        from orders_info
        WHERE id = #{value}
    </select>

 phi_platform_user/src/main/java/com/hx/phip/controller/order/OrderControllerV2.java

@@ -222,7 +222,8 @@
        String opShopId = shopId;

        //执行开单方法
        Map<String, Object> map = orderServiceV2.orderCreate(orderTotal, orderItem, type, orderDeveloperList, operator, shop,opShopId,userMoney,user,platformApplication, orderRiseList, commonService);
        Map<String, Object> map = orderServiceV2.orderCreate(orderTotal, orderItem, type, orderDeveloperList
                , operator, shop,opShopId,userMoney,user,platformApplication, orderRiseList,dto, commonService);

        //返回phis订单号、phis订单id
        return  PlatformResult.success(map);

 phi_platform_user/src/main/java/com/hx/phip/service/order/OrderServiceV2.java

@@ -11,6 +11,7 @@
import com.hx.phiappt.model.coupon.Coupon;
import com.hx.phiappt.model.coupon.CouponNumber;
import com.hx.phiappt.model.order.*;
import com.hz.his.dto.order.OrderPHisDto;
import com.hz.his.dto.order.OrderRiseDto;
import com.hz.his.dto.order.PayDto;
import com.hz.his.feign.service.sync.SyncOrderService;
@@ -33,8 +34,8 @@
     * @return
     */
    Map<String, Object> orderCreate(OrdersTotal ordersTotal, List<OrderItem> items, Integer type, List<OrderDeveloper> orderDeveloperList
            , Map<String, String> operator, Shop shop,String opShopId, UserMoney userMoney, User user, PlatformApplication platformApplication
            , List<OrderRise> orderRiseList, CommonService commonService);
            , Map<String, String> operator, Shop shop, String opShopId, UserMoney userMoney, User user, PlatformApplication platformApplication
            , List<OrderRise> orderRiseList, OrderPHisDto orderPHisDto, CommonService commonService);

    /**
     * 结账接口

 phi_platform_user/src/main/java/com/hx/phip/service/order/impl/OrderServiceV2Impl.java

@@ -49,6 +49,7 @@
import com.hz.his.dto.coupon.CouponCheckDto;
import com.hz.his.dto.coupon.CouponCheckItemDto;
import com.hz.his.dto.gzh.GzhTemplateVO;
import com.hz.his.dto.order.OrderPHisDto;
import com.hz.his.dto.order.PayAmountDto;
import com.hz.his.dto.order.PayDto;
import com.hz.his.feign.service.dcp.SUserTagInfoService;
@@ -131,8 +132,8 @@
     * */
    @Override
    public Map<String, Object> orderCreate(OrdersTotal ordersTotal, List<OrderItem> items, Integer type, List<OrderDeveloper> orderDeveloperList
            , Map<String, String> operator, Shop shop,String opShopId, UserMoney userMoney, User user, PlatformApplication platformApplication
            , List<OrderRise> orderRiseList, CommonService commonService) {
            , Map<String, String> operator, Shop shop, String opShopId, UserMoney userMoney, User user, PlatformApplication platformApplication
            , List<OrderRise> orderRiseList, OrderPHisDto orderPHisDto, CommonService commonService) {
        //定义总订单金额初始字段
        //总订单订单售价总金额
        BigDecimal totalPrice=BigDecimal.ZERO;
@@ -259,7 +260,7 @@

        //主线业务
        //保存订单其他信息(对象:orderInfo)
        String activityName = OrderCreateUtil.saveOrderInfo(ordersTotal, user,customParameter,isOldBringNew,isBothTheOne, commonService);
        String activityName = OrderCreateUtil.saveOrderInfo(ordersTotal, user,customParameter,isOldBringNew,isBothTheOne,orderPHisDto, commonService);

        //保存一级子订单和处理二级子订单信息(orderItem、orderItemSon)
        if(!orderTypeList.contains(ordersTotal.getType())){

 phi_platform_user/src/main/java/com/hx/phip/util/api/OrderCreateUtil.java

@@ -80,6 +80,7 @@
import com.hz.his.dto.marketing.OrderDiscountDto;
import com.hz.his.dto.marketing.OrderPayMarketingDto;
import com.hz.his.dto.marketing.RefundProjectDto;
import com.hz.his.dto.order.OrderPHisDto;
import com.hz.his.dto.order.OrderRiseDto;
import com.hz.his.dto.order.OrdersTotalDto;
import com.hz.his.feign.service.marketing.MOrderService;
@@ -1527,7 +1528,8 @@
     * @param commonService
     * @param isOldBringNew 是否老带新(0:否,1:是)
     */
    public static String saveOrderInfo(OrdersTotal ordersTotal, User user,CustomParameter customParameter, Integer isOldBringNew,Integer isBothTheOne, CommonService commonService) {
    public static String saveOrderInfo(OrdersTotal ordersTotal, User user, CustomParameter customParameter, Integer isOldBringNew, Integer isBothTheOne
            , OrderPHisDto orderPHisDto, CommonService commonService) {
        String activityName = "";
        OrderInfo orderInfo = ordersTotal.getOrderInfo();
        logger.info("接收的orderInfo:"+JSON.toJSONString(orderInfo));
@@ -1639,6 +1641,17 @@
        orderInfo.setChannelAssist2Name(user.getChannelAssist2Name());
        orderInfo.setChannelAssist2Json(UserChannelTool.getChannelJsonInfo(commonService, user.getChannelAssist2Id()));

        //收件地址
        if(orderPHisDto.getDeliveryAddress() != null){
            orderInfo.setLinkMan(orderPHisDto.getDeliveryAddress().getLinkMan());
            orderInfo.setLinkTel(orderPHisDto.getDeliveryAddress().getLinkTel());
            orderInfo.setProvince(orderPHisDto.getDeliveryAddress().getProvince());
            orderInfo.setCity(orderPHisDto.getDeliveryAddress().getCity());
            orderInfo.setArea(orderPHisDto.getDeliveryAddress().getArea());
            orderInfo.setStreet(orderPHisDto.getDeliveryAddress().getStreet());
            orderInfo.setAddrDetail(orderPHisDto.getDeliveryAddress().getAddrDetail());
        }

        orderInfo.setSnapPayTotal(BigDecimal.ZERO);
        orderInfo.setIsOldBringNew(isOldBringNew);
        orderInfo.setIsBothTheOne(isBothTheOne);