增加订单存储字段

fwq

2023-12-13 59f4be9f0b3f9caae2ebf9999e63f0e8c1e04997

增加订单存储字段

 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},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},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,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},#{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,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>

    <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,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},#{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,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>

    <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,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,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,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,isDel,createTime,editTime
        from orders_info
        WHERE id = #{value}
    </select>

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

@@ -1529,6 +1529,7 @@
    public static String saveOrderInfo(OrdersTotal ordersTotal, User user,CustomParameter customParameter, Integer isOldBringNew,Integer isBothTheOne, CommonService commonService) {
        String activityName = "";
        OrderInfo orderInfo = ordersTotal.getOrderInfo();
        logger.info("接收的orderInfo:"+JSON.toJSONString(orderInfo));
        orderInfo.setOrderId(ordersTotal.getId());
        //如果有用活动规则将活动规则保存在orderInfo
        if (ordersTotal.getActivityIds() != null && ordersTotal.getActivityIds().size() > 0) {