chenjiahe
2024-02-21 8cbcbec9d300d5fe6862b8a0f710c6daa6cb609e
爆款活动
5个文件已修改
79 ■■■■ 已修改文件
phi_platform_common/src/main/java/com/hx/phip/AutoDomeUtil.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
phi_platform_common/src/main/resources/mapper/platform/OrdersTotalMapper.xml 13 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
phi_platform_user/src/main/java/com/hx/phip/controller/order/OrderControllerV2.java 12 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
phi_platform_user/src/main/java/com/hx/phip/service/impl/UserMoneyServiceImpl.java 3 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
phi_platform_user/src/main/java/com/hx/phip/util/api/UserMoneyUtil.java 49 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
phi_platform_common/src/main/java/com/hx/phip/AutoDomeUtil.java
@@ -46,7 +46,7 @@
        urlData.serviceImplUrlData(controllerPackRoot,packageName + ".service.impl");
        urlData.mapperUrlData(commonPackRootResourse, "mapper.platform");
        Class<?> clas = MarketSystem.class;
        Class<?> clas = OrdersTotal.class;
        //dao
         GeneratorUtil.generatorDao(clas,urlData);
        //mapper
phi_platform_common/src/main/resources/mapper/platform/OrdersTotalMapper.xml
@@ -8,7 +8,7 @@
    <!-- 整个实体类修改,表字段=实体类字段-->
    <sql id="Update_Column_All">
        <trim prefixOverrides=",">
            ,orderNo = #{orderNo},orderClassify = #{orderClassify},type = #{type},koapOrderId = #{koapOrderId},hisSynStatus = #{hisSynStatus},sealStatus = #{sealStatus},hisOrderId = #{hisOrderId},appointmentId = #{appointmentId},remarks = #{remarks},payTime = #{payTime},cancelTime = #{cancelTime},appId = #{appId},appIdCode = #{appIdCode},sourceCode = #{sourceCode},sourceName = #{sourceName},sourceOrderNo = #{sourceOrderNo},inviteeType = #{inviteeType},inviteeId = #{inviteeId},inviteeName = #{inviteeName},userBelongingType = #{userBelongingType},channelType = #{channelType},commonId = #{commonId},commonName = #{commonName},isGenerationPay = #{isGenerationPay},payUserId = #{payUserId},payUserNo = #{payUserNo},payUserName = #{payUserName},payUserCIQ = #{payUserCIQ},payUserMemberId = #{payUserMemberId},payUserMemberNo = #{payUserMemberNo},payUserLevel = #{payUserLevel},payUserAdviserId = #{payUserAdviserId},payUserAdviserNo = #{payUserAdviserNo},payUserAdviserName = #{payUserAdviserName},payUserShopId = #{payUserShopId},payUserShopNo = #{payUserShopNo},payUserShopName = #{payUserShopName},cjLabel = #{cjLabel},beauticianCorpUserId = #{beauticianCorpUserId},beauticianCorpUserName = #{beauticianCorpUserName},cashierId = #{cashierId},cashierName = #{cashierName},cashierShopId = #{cashierShopId},cashierShopName = #{cashierShopName},isSwitch = #{isSwitch},syncStatus = #{syncStatus},status = #{status},payStatus = #{payStatus},refundStatus = #{refundStatus},applyStatus = #{applyStatus},shopId = #{shopId},shopName = #{shopName},operatorType = #{operatorType},operatorId = #{operatorId},operatorName = #{operatorName},developerShopId = #{developerShopId},developerShopName = #{developerShopName},developerId = #{developerId},developerName = #{developerName},departmentCode = #{departmentCode},departmentName = #{departmentName},beauticianId = #{beauticianId},beauticianName = #{beauticianName},doctorId = #{doctorId},doctorName = #{doctorName},userId = #{userId},userName = #{userName},CIQ = #{CIQ},storedValueFund = #{storedValueFund},valueAddedFund = #{valueAddedFund},integral = #{integral},userLevel = #{userLevel},userShopId = #{userShopId},userShopNo = #{userShopNo},userShopName = #{userShopName},oriTotal = #{oriTotal},total = #{total},shouldTotal = #{shouldTotal},actualTotal = #{actualTotal},payTotal = #{payTotal},payRecharge = #{payRecharge},payIncrement = #{payIncrement},discountTotal = #{discountTotal},activityTotal = #{activityTotal},couponTotal = #{couponTotal},givingAmount = #{givingAmount},givingType = #{givingType},discountIntegral = #{discountIntegral},oriIntegralTotal = #{oriIntegralTotal},proIntegralTotal = #{proIntegralTotal},totalPoints = #{totalPoints},shouldTotalPoints = #{shouldTotalPoints},actualTotalPoints = #{actualTotalPoints},reTotal = #{reTotal},reIntegralTotal = #{reIntegralTotal},reCashTotal = #{reCashTotal},reCashPurenessTotal = #{reCashPurenessTotal},reRechargeTotal = #{reRechargeTotal},reIncrementTotal = #{reIncrementTotal},conversionCode = #{conversionCode},isSyncOrder = #{isSyncOrder},addTime = #{addTime},addWay = #{addWay},isGroupBuy = #{isGroupBuy},isDel = #{isDel},createTime = #{createTime},editTime = #{editTime}
            ,orderNo = #{orderNo},orderClassify = #{orderClassify},type = #{type},koapOrderId = #{koapOrderId},hisSynStatus = #{hisSynStatus},sealStatus = #{sealStatus},hisOrderId = #{hisOrderId},appointmentId = #{appointmentId},remarks = #{remarks},payTime = #{payTime},cancelTime = #{cancelTime},appId = #{appId},appIdCode = #{appIdCode},sourceCode = #{sourceCode},sourceName = #{sourceName},sourceOrderNo = #{sourceOrderNo},inviteeType = #{inviteeType},inviteeId = #{inviteeId},inviteeName = #{inviteeName},userBelongingType = #{userBelongingType},channelType = #{channelType},commonId = #{commonId},commonName = #{commonName},isGenerationPay = #{isGenerationPay},payUserId = #{payUserId},payUserNo = #{payUserNo},payUserName = #{payUserName},payUserCIQ = #{payUserCIQ},payUserMemberId = #{payUserMemberId},payUserMemberNo = #{payUserMemberNo},payUserLevel = #{payUserLevel},payUserAdviserId = #{payUserAdviserId},payUserAdviserNo = #{payUserAdviserNo},payUserAdviserName = #{payUserAdviserName},payUserShopId = #{payUserShopId},payUserShopNo = #{payUserShopNo},payUserShopName = #{payUserShopName},cjLabel = #{cjLabel},beauticianCorpUserId = #{beauticianCorpUserId},beauticianCorpUserName = #{beauticianCorpUserName},cashierId = #{cashierId},cashierName = #{cashierName},cashierShopId = #{cashierShopId},cashierShopName = #{cashierShopName},isSwitch = #{isSwitch},syncStatus = #{syncStatus},status = #{status},payStatus = #{payStatus},refundStatus = #{refundStatus},applyStatus = #{applyStatus},shopId = #{shopId},shopName = #{shopName},operatorType = #{operatorType},operatorId = #{operatorId},operatorName = #{operatorName},developerShopId = #{developerShopId},developerShopName = #{developerShopName},developerId = #{developerId},developerName = #{developerName},departmentCode = #{departmentCode},departmentName = #{departmentName},beauticianId = #{beauticianId},beauticianName = #{beauticianName},doctorId = #{doctorId},doctorName = #{doctorName},userId = #{userId},userName = #{userName},CIQ = #{CIQ},storedValueFund = #{storedValueFund},valueAddedFund = #{valueAddedFund},integral = #{integral},userLevel = #{userLevel},userShopId = #{userShopId},userShopNo = #{userShopNo},userShopName = #{userShopName},oriTotal = #{oriTotal},total = #{total},shouldTotal = #{shouldTotal},actualTotal = #{actualTotal},payTotal = #{payTotal},payRecharge = #{payRecharge},payIncrement = #{payIncrement},discountTotal = #{discountTotal},activityTotal = #{activityTotal},couponTotal = #{couponTotal},discountIntegral = #{discountIntegral},oriIntegralTotal = #{oriIntegralTotal},proIntegralTotal = #{proIntegralTotal},totalPoints = #{totalPoints},shouldTotalPoints = #{shouldTotalPoints},actualTotalPoints = #{actualTotalPoints},reTotal = #{reTotal},reIntegralTotal = #{reIntegralTotal},reCashTotal = #{reCashTotal},reCashPurenessTotal = #{reCashPurenessTotal},reRechargeTotal = #{reRechargeTotal},reIncrementTotal = #{reIncrementTotal},conversionCode = #{conversionCode},isSyncOrder = #{isSyncOrder},addTime = #{addTime},addWay = #{addWay},isGroupBuy = #{isGroupBuy},activityPageType = #{activityPageType},activityPageCode = #{activityPageCode},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_total (id,orderNo,orderClassify,type,koapOrderId,hisSynStatus,sealStatus,hisOrderId,appointmentId,remarks,payTime,cancelTime,appId,appIdCode,sourceCode,sourceName,sourceOrderNo,inviteeType,inviteeId,inviteeName,userBelongingType,channelType,commonId,commonName,isGenerationPay,payUserId,payUserNo,payUserName,payUserCIQ,payUserMemberId,payUserMemberNo,payUserLevel,payUserAdviserId,payUserAdviserNo,payUserAdviserName,payUserShopId,payUserShopNo,payUserShopName,cjLabel,beauticianCorpUserId,beauticianCorpUserName,cashierId,cashierName,cashierShopId,cashierShopName,isSwitch,syncStatus,status,payStatus,refundStatus,applyStatus,shopId,shopName,operatorType,operatorId,operatorName,developerShopId,developerShopName,developerId,developerName,departmentCode,departmentName,beauticianId,beauticianName,doctorId,doctorName,userId,userName,CIQ,storedValueFund,valueAddedFund,integral,userLevel,userShopId,userShopNo,userShopName,oriTotal,total,shouldTotal,actualTotal,payTotal,payRecharge,payIncrement,discountTotal,activityTotal,couponTotal,givingAmount,givingType,discountIntegral,oriIntegralTotal,proIntegralTotal,totalPoints,shouldTotalPoints,actualTotalPoints,reTotal,reIntegralTotal,reCashTotal,reCashPurenessTotal,reRechargeTotal,reIncrementTotal,conversionCode,isSyncOrder,addTime,addWay,isGroupBuy,isDel,createTime,editTime)  values (#{id},#{orderNo},#{orderClassify},#{type},#{koapOrderId},#{hisSynStatus},#{sealStatus},#{hisOrderId},#{appointmentId},#{remarks},#{payTime},#{cancelTime},#{appId},#{appIdCode},#{sourceCode},#{sourceName},#{sourceOrderNo},#{inviteeType},#{inviteeId},#{inviteeName},#{userBelongingType},#{channelType},#{commonId},#{commonName},#{isGenerationPay},#{payUserId},#{payUserNo},#{payUserName},#{payUserCIQ},#{payUserMemberId},#{payUserMemberNo},#{payUserLevel},#{payUserAdviserId},#{payUserAdviserNo},#{payUserAdviserName},#{payUserShopId},#{payUserShopNo},#{payUserShopName},#{cjLabel},#{beauticianCorpUserId},#{beauticianCorpUserName},#{cashierId},#{cashierName},#{cashierShopId},#{cashierShopName},#{isSwitch},#{syncStatus},#{status},#{payStatus},#{refundStatus},#{applyStatus},#{shopId},#{shopName},#{operatorType},#{operatorId},#{operatorName},#{developerShopId},#{developerShopName},#{developerId},#{developerName},#{departmentCode},#{departmentName},#{beauticianId},#{beauticianName},#{doctorId},#{doctorName},#{userId},#{userName},#{CIQ},#{storedValueFund},#{valueAddedFund},#{integral},#{userLevel},#{userShopId},#{userShopNo},#{userShopName},#{oriTotal},#{total},#{shouldTotal},#{actualTotal},#{payTotal},#{payRecharge},#{payIncrement},#{discountTotal},#{activityTotal},#{couponTotal},#{givingAmount},#{givingType},#{discountIntegral},#{oriIntegralTotal},#{proIntegralTotal},#{totalPoints},#{shouldTotalPoints},#{actualTotalPoints},#{reTotal},#{reIntegralTotal},#{reCashTotal},#{reCashPurenessTotal},#{reRechargeTotal},#{reIncrementTotal},#{conversionCode},#{isSyncOrder},#{addTime},#{addWay},#{isGroupBuy},#{isDel},#{createTime},#{editTime})
        insert into orders_total (id,orderNo,orderClassify,type,koapOrderId,hisSynStatus,sealStatus,hisOrderId,appointmentId,remarks,payTime,cancelTime,appId,appIdCode,sourceCode,sourceName,sourceOrderNo,inviteeType,inviteeId,inviteeName,userBelongingType,channelType,commonId,commonName,isGenerationPay,payUserId,payUserNo,payUserName,payUserCIQ,payUserMemberId,payUserMemberNo,payUserLevel,payUserAdviserId,payUserAdviserNo,payUserAdviserName,payUserShopId,payUserShopNo,payUserShopName,cjLabel,beauticianCorpUserId,beauticianCorpUserName,cashierId,cashierName,cashierShopId,cashierShopName,isSwitch,syncStatus,status,payStatus,refundStatus,applyStatus,shopId,shopName,operatorType,operatorId,operatorName,developerShopId,developerShopName,developerId,developerName,departmentCode,departmentName,beauticianId,beauticianName,doctorId,doctorName,userId,userName,CIQ,storedValueFund,valueAddedFund,integral,userLevel,userShopId,userShopNo,userShopName,oriTotal,total,shouldTotal,actualTotal,payTotal,payRecharge,payIncrement,discountTotal,activityTotal,couponTotal,discountIntegral,oriIntegralTotal,proIntegralTotal,totalPoints,shouldTotalPoints,actualTotalPoints,reTotal,reIntegralTotal,reCashTotal,reCashPurenessTotal,reRechargeTotal,reIncrementTotal,conversionCode,isSyncOrder,addTime,addWay,isGroupBuy,activityPageType,activityPageCode,isDel,createTime,editTime)  values (#{id},#{orderNo},#{orderClassify},#{type},#{koapOrderId},#{hisSynStatus},#{sealStatus},#{hisOrderId},#{appointmentId},#{remarks},#{payTime},#{cancelTime},#{appId},#{appIdCode},#{sourceCode},#{sourceName},#{sourceOrderNo},#{inviteeType},#{inviteeId},#{inviteeName},#{userBelongingType},#{channelType},#{commonId},#{commonName},#{isGenerationPay},#{payUserId},#{payUserNo},#{payUserName},#{payUserCIQ},#{payUserMemberId},#{payUserMemberNo},#{payUserLevel},#{payUserAdviserId},#{payUserAdviserNo},#{payUserAdviserName},#{payUserShopId},#{payUserShopNo},#{payUserShopName},#{cjLabel},#{beauticianCorpUserId},#{beauticianCorpUserName},#{cashierId},#{cashierName},#{cashierShopId},#{cashierShopName},#{isSwitch},#{syncStatus},#{status},#{payStatus},#{refundStatus},#{applyStatus},#{shopId},#{shopName},#{operatorType},#{operatorId},#{operatorName},#{developerShopId},#{developerShopName},#{developerId},#{developerName},#{departmentCode},#{departmentName},#{beauticianId},#{beauticianName},#{doctorId},#{doctorName},#{userId},#{userName},#{CIQ},#{storedValueFund},#{valueAddedFund},#{integral},#{userLevel},#{userShopId},#{userShopNo},#{userShopName},#{oriTotal},#{total},#{shouldTotal},#{actualTotal},#{payTotal},#{payRecharge},#{payIncrement},#{discountTotal},#{activityTotal},#{couponTotal},#{discountIntegral},#{oriIntegralTotal},#{proIntegralTotal},#{totalPoints},#{shouldTotalPoints},#{actualTotalPoints},#{reTotal},#{reIntegralTotal},#{reCashTotal},#{reCashPurenessTotal},#{reRechargeTotal},#{reIncrementTotal},#{conversionCode},#{isSyncOrder},#{addTime},#{addWay},#{isGroupBuy},#{activityPageType},#{activityPageCode},#{isDel},#{createTime},#{editTime})
    </insert>
    <insert id="insertById" parameterType="com.hx.phiappt.model.order.OrdersTotal">
        insert into orders_total (id,orderNo,orderClassify,type,koapOrderId,hisSynStatus,sealStatus,hisOrderId,appointmentId,remarks,payTime,cancelTime,appId,appIdCode,sourceCode,sourceName,sourceOrderNo,inviteeType,inviteeId,inviteeName,userBelongingType,channelType,commonId,commonName,isGenerationPay,payUserId,payUserNo,payUserName,payUserCIQ,payUserMemberId,payUserMemberNo,payUserLevel,payUserAdviserId,payUserAdviserNo,payUserAdviserName,payUserShopId,payUserShopNo,payUserShopName,cjLabel,beauticianCorpUserId,beauticianCorpUserName,cashierId,cashierName,cashierShopId,cashierShopName,isSwitch,syncStatus,status,payStatus,refundStatus,applyStatus,shopId,shopName,operatorType,operatorId,operatorName,developerShopId,developerShopName,developerId,developerName,departmentCode,departmentName,beauticianId,beauticianName,doctorId,doctorName,userId,userName,CIQ,storedValueFund,valueAddedFund,integral,userLevel,userShopId,userShopNo,userShopName,oriTotal,total,shouldTotal,actualTotal,payTotal,payRecharge,payIncrement,discountTotal,activityTotal,couponTotal,givingAmount,givingType,discountIntegral,oriIntegralTotal,proIntegralTotal,totalPoints,shouldTotalPoints,actualTotalPoints,reTotal,reIntegralTotal,reCashTotal,reCashPurenessTotal,reRechargeTotal,reIncrementTotal,conversionCode,isSyncOrder,addTime,addWay,isGroupBuy,isDel,createTime,editTime)  values (#{id},#{orderNo},#{orderClassify},#{type},#{koapOrderId},#{hisSynStatus},#{sealStatus},#{hisOrderId},#{appointmentId},#{remarks},#{payTime},#{cancelTime},#{appId},#{appIdCode},#{sourceCode},#{sourceName},#{sourceOrderNo},#{inviteeType},#{inviteeId},#{inviteeName},#{userBelongingType},#{channelType},#{commonId},#{commonName},#{isGenerationPay},#{payUserId},#{payUserNo},#{payUserName},#{payUserCIQ},#{payUserMemberId},#{payUserMemberNo},#{payUserLevel},#{payUserAdviserId},#{payUserAdviserNo},#{payUserAdviserName},#{payUserShopId},#{payUserShopNo},#{payUserShopName},#{cjLabel},#{beauticianCorpUserId},#{beauticianCorpUserName},#{cashierId},#{cashierName},#{cashierShopId},#{cashierShopName},#{isSwitch},#{syncStatus},#{status},#{payStatus},#{refundStatus},#{applyStatus},#{shopId},#{shopName},#{operatorType},#{operatorId},#{operatorName},#{developerShopId},#{developerShopName},#{developerId},#{developerName},#{departmentCode},#{departmentName},#{beauticianId},#{beauticianName},#{doctorId},#{doctorName},#{userId},#{userName},#{CIQ},#{storedValueFund},#{valueAddedFund},#{integral},#{userLevel},#{userShopId},#{userShopNo},#{userShopName},#{oriTotal},#{total},#{shouldTotal},#{actualTotal},#{payTotal},#{payRecharge},#{payIncrement},#{discountTotal},#{activityTotal},#{couponTotal},#{givingAmount},#{givingType},#{discountIntegral},#{oriIntegralTotal},#{proIntegralTotal},#{totalPoints},#{shouldTotalPoints},#{actualTotalPoints},#{reTotal},#{reIntegralTotal},#{reCashTotal},#{reCashPurenessTotal},#{reRechargeTotal},#{reIncrementTotal},#{conversionCode},#{isSyncOrder},#{addTime},#{addWay},#{isGroupBuy},#{isDel},#{createTime},#{editTime})
        insert into orders_total (id,orderNo,orderClassify,type,koapOrderId,hisSynStatus,sealStatus,hisOrderId,appointmentId,remarks,payTime,cancelTime,appId,appIdCode,sourceCode,sourceName,sourceOrderNo,inviteeType,inviteeId,inviteeName,userBelongingType,channelType,commonId,commonName,isGenerationPay,payUserId,payUserNo,payUserName,payUserCIQ,payUserMemberId,payUserMemberNo,payUserLevel,payUserAdviserId,payUserAdviserNo,payUserAdviserName,payUserShopId,payUserShopNo,payUserShopName,cjLabel,beauticianCorpUserId,beauticianCorpUserName,cashierId,cashierName,cashierShopId,cashierShopName,isSwitch,syncStatus,status,payStatus,refundStatus,applyStatus,shopId,shopName,operatorType,operatorId,operatorName,developerShopId,developerShopName,developerId,developerName,departmentCode,departmentName,beauticianId,beauticianName,doctorId,doctorName,userId,userName,CIQ,storedValueFund,valueAddedFund,integral,userLevel,userShopId,userShopNo,userShopName,oriTotal,total,shouldTotal,actualTotal,payTotal,payRecharge,payIncrement,discountTotal,activityTotal,couponTotal,discountIntegral,oriIntegralTotal,proIntegralTotal,totalPoints,shouldTotalPoints,actualTotalPoints,reTotal,reIntegralTotal,reCashTotal,reCashPurenessTotal,reRechargeTotal,reIncrementTotal,conversionCode,isSyncOrder,addTime,addWay,isGroupBuy,activityPageType,activityPageCode,isDel,createTime,editTime)  values (#{id},#{orderNo},#{orderClassify},#{type},#{koapOrderId},#{hisSynStatus},#{sealStatus},#{hisOrderId},#{appointmentId},#{remarks},#{payTime},#{cancelTime},#{appId},#{appIdCode},#{sourceCode},#{sourceName},#{sourceOrderNo},#{inviteeType},#{inviteeId},#{inviteeName},#{userBelongingType},#{channelType},#{commonId},#{commonName},#{isGenerationPay},#{payUserId},#{payUserNo},#{payUserName},#{payUserCIQ},#{payUserMemberId},#{payUserMemberNo},#{payUserLevel},#{payUserAdviserId},#{payUserAdviserNo},#{payUserAdviserName},#{payUserShopId},#{payUserShopNo},#{payUserShopName},#{cjLabel},#{beauticianCorpUserId},#{beauticianCorpUserName},#{cashierId},#{cashierName},#{cashierShopId},#{cashierShopName},#{isSwitch},#{syncStatus},#{status},#{payStatus},#{refundStatus},#{applyStatus},#{shopId},#{shopName},#{operatorType},#{operatorId},#{operatorName},#{developerShopId},#{developerShopName},#{developerId},#{developerName},#{departmentCode},#{departmentName},#{beauticianId},#{beauticianName},#{doctorId},#{doctorName},#{userId},#{userName},#{CIQ},#{storedValueFund},#{valueAddedFund},#{integral},#{userLevel},#{userShopId},#{userShopNo},#{userShopName},#{oriTotal},#{total},#{shouldTotal},#{actualTotal},#{payTotal},#{payRecharge},#{payIncrement},#{discountTotal},#{activityTotal},#{couponTotal},#{discountIntegral},#{oriIntegralTotal},#{proIntegralTotal},#{totalPoints},#{shouldTotalPoints},#{actualTotalPoints},#{reTotal},#{reIntegralTotal},#{reCashTotal},#{reCashPurenessTotal},#{reRechargeTotal},#{reIncrementTotal},#{conversionCode},#{isSyncOrder},#{addTime},#{addWay},#{isGroupBuy},#{activityPageType},#{activityPageCode},#{isDel},#{createTime},#{editTime})
    </insert>
    <select id="selectList" resultType="com.hx.phiappt.model.order.OrdersTotal" parameterType="com.hx.mybatisTool.SqlSentence" >
@@ -55,14 +55,14 @@
    <select id="selectOneByKey" resultType="com.hx.phiappt.model.order.OrdersTotal" parameterType="java.lang.Object" >
        select 
            id,orderNo,orderClassify,type,koapOrderId,hisSynStatus,sealStatus,hisOrderId,appointmentId,remarks,payTime,cancelTime,appId,appIdCode,sourceCode,sourceName,sourceOrderNo,inviteeType,inviteeId,inviteeName,userBelongingType,channelType,commonId,commonName,isGenerationPay,payUserId,payUserNo,payUserName,payUserCIQ,payUserMemberId,payUserMemberNo,payUserLevel,payUserAdviserId,payUserAdviserNo,payUserAdviserName,payUserShopId,payUserShopNo,payUserShopName,cjLabel,beauticianCorpUserId,beauticianCorpUserName,cashierId,cashierName,cashierShopId,cashierShopName,isSwitch,syncStatus,status,payStatus,refundStatus,applyStatus,shopId,shopName,operatorType,operatorId,operatorName,developerShopId,developerShopName,developerId,developerName,departmentCode,departmentName,beauticianId,beauticianName,doctorId,doctorName,userId,userName,CIQ,storedValueFund,valueAddedFund,integral,userLevel,userShopId,userShopNo,userShopName,oriTotal,total,shouldTotal,actualTotal,payTotal,payRecharge,payIncrement,discountTotal,activityTotal,couponTotal,givingAmount,givingType,discountIntegral,oriIntegralTotal,proIntegralTotal,totalPoints,shouldTotalPoints,actualTotalPoints,reTotal,reIntegralTotal,reCashTotal,reCashPurenessTotal,reRechargeTotal,reIncrementTotal,conversionCode,isSyncOrder,addTime,addWay,isGroupBuy,isDel,createTime,editTime
            id,orderNo,orderClassify,type,koapOrderId,hisSynStatus,sealStatus,hisOrderId,appointmentId,remarks,payTime,cancelTime,appId,appIdCode,sourceCode,sourceName,sourceOrderNo,inviteeType,inviteeId,inviteeName,userBelongingType,channelType,commonId,commonName,isGenerationPay,payUserId,payUserNo,payUserName,payUserCIQ,payUserMemberId,payUserMemberNo,payUserLevel,payUserAdviserId,payUserAdviserNo,payUserAdviserName,payUserShopId,payUserShopNo,payUserShopName,cjLabel,beauticianCorpUserId,beauticianCorpUserName,cashierId,cashierName,cashierShopId,cashierShopName,isSwitch,syncStatus,status,payStatus,refundStatus,applyStatus,shopId,shopName,operatorType,operatorId,operatorName,developerShopId,developerShopName,developerId,developerName,departmentCode,departmentName,beauticianId,beauticianName,doctorId,doctorName,userId,userName,CIQ,storedValueFund,valueAddedFund,integral,userLevel,userShopId,userShopNo,userShopName,oriTotal,total,shouldTotal,actualTotal,payTotal,payRecharge,payIncrement,discountTotal,activityTotal,couponTotal,discountIntegral,oriIntegralTotal,proIntegralTotal,totalPoints,shouldTotalPoints,actualTotalPoints,reTotal,reIntegralTotal,reCashTotal,reCashPurenessTotal,reRechargeTotal,reIncrementTotal,conversionCode,isSyncOrder,addTime,addWay,isGroupBuy,activityPageType,activityPageCode,isDel,createTime,editTime
        from orders_total
        WHERE id = #{value}
    </select>
    <select id="selectOneByKeyBlob" resultType="com.hx.phiappt.model.order.OrdersTotal" parameterType="java.lang.Object" >
        select 
            id,orderNo,orderClassify,type,koapOrderId,hisSynStatus,sealStatus,hisOrderId,appointmentId,remarks,payTime,cancelTime,appId,appIdCode,sourceCode,sourceName,sourceOrderNo,inviteeType,inviteeId,inviteeName,userBelongingType,channelType,commonId,commonName,isGenerationPay,payUserId,payUserNo,payUserName,payUserCIQ,payUserMemberId,payUserMemberNo,payUserLevel,payUserAdviserId,payUserAdviserNo,payUserAdviserName,payUserShopId,payUserShopNo,payUserShopName,cjLabel,beauticianCorpUserId,beauticianCorpUserName,cashierId,cashierName,cashierShopId,cashierShopName,isSwitch,syncStatus,status,payStatus,refundStatus,applyStatus,shopId,shopName,operatorType,operatorId,operatorName,developerShopId,developerShopName,developerId,developerName,departmentCode,departmentName,beauticianId,beauticianName,doctorId,doctorName,userId,userName,CIQ,storedValueFund,valueAddedFund,integral,userLevel,userShopId,userShopNo,userShopName,oriTotal,total,shouldTotal,actualTotal,payTotal,payRecharge,payIncrement,discountTotal,activityTotal,couponTotal,givingAmount,givingType,discountIntegral,oriIntegralTotal,proIntegralTotal,totalPoints,shouldTotalPoints,actualTotalPoints,reTotal,reIntegralTotal,reCashTotal,reCashPurenessTotal,reRechargeTotal,reIncrementTotal,conversionCode,isSyncOrder,addTime,addWay,isGroupBuy,isDel,createTime,editTime
            id,orderNo,orderClassify,type,koapOrderId,hisSynStatus,sealStatus,hisOrderId,appointmentId,remarks,payTime,cancelTime,appId,appIdCode,sourceCode,sourceName,sourceOrderNo,inviteeType,inviteeId,inviteeName,userBelongingType,channelType,commonId,commonName,isGenerationPay,payUserId,payUserNo,payUserName,payUserCIQ,payUserMemberId,payUserMemberNo,payUserLevel,payUserAdviserId,payUserAdviserNo,payUserAdviserName,payUserShopId,payUserShopNo,payUserShopName,cjLabel,beauticianCorpUserId,beauticianCorpUserName,cashierId,cashierName,cashierShopId,cashierShopName,isSwitch,syncStatus,status,payStatus,refundStatus,applyStatus,shopId,shopName,operatorType,operatorId,operatorName,developerShopId,developerShopName,developerId,developerName,departmentCode,departmentName,beauticianId,beauticianName,doctorId,doctorName,userId,userName,CIQ,storedValueFund,valueAddedFund,integral,userLevel,userShopId,userShopNo,userShopName,oriTotal,total,shouldTotal,actualTotal,payTotal,payRecharge,payIncrement,discountTotal,activityTotal,couponTotal,discountIntegral,oriIntegralTotal,proIntegralTotal,totalPoints,shouldTotalPoints,actualTotalPoints,reTotal,reIntegralTotal,reCashTotal,reCashPurenessTotal,reRechargeTotal,reIncrementTotal,conversionCode,isSyncOrder,addTime,addWay,isGroupBuy,activityPageType,activityPageCode,isDel,createTime,editTime
        from orders_total
        WHERE id = #{value}
    </select>
@@ -104,6 +104,7 @@
    
    
    
@@ -120,6 +121,7 @@
    
    
    
@@ -176,6 +178,7 @@
    
    
    
    <update id="updatePay">
        update
            orders_total
phi_platform_user/src/main/java/com/hx/phip/controller/order/OrderControllerV2.java
@@ -13,6 +13,7 @@
import com.hx.common.service.CommonService;
import com.hx.exception.TipsException;
import com.hx.mybatisTool.SqlSentence;
import com.hx.phiappt.common.OperationReasonConstants;
import com.hx.phiappt.common.OrderTotalConstants;
import com.hx.phiappt.common.PlatformConstants;
import com.hx.phiappt.common.UserStatusConstants;
@@ -26,6 +27,7 @@
import com.hx.phiappt.model.market.system.MarketSystem;
import com.hx.phiappt.model.order.*;
import com.hx.phiappt.model.performance.PerformanceInfo;
import com.hx.phiappt.model.userMoney.UserMoneyUnclaimed;
import com.hx.phiappt.model.userStatus.UserStatusLog;
import com.hx.phip.config.BotoxClubConfig;
import com.hx.phip.config.CustomParameter;
@@ -38,10 +40,7 @@
import com.hx.phip.service.init.OrderInitService;
import com.hx.phip.service.order.OrderServiceV2;
import com.hx.phip.service.tool.club.UserCluebMemberServiceTool;
import com.hx.phip.util.api.ApiOrderUtil;
import com.hx.phip.util.api.OrderCreateUtil;
import com.hx.phip.util.api.OrderPayMoneyUtil;
import com.hx.phip.util.api.SendNoticeUtil;
import com.hx.phip.util.api.*;
import com.hx.util.StringUtils;
import com.hx.util.thread.ExecutorServiceTool;
import com.hz.crm.dto.oldBrinNew.OldBrinNewDto;
@@ -361,6 +360,11 @@
        //执行结账方法,结账成功要注意运行重新算订单部分金额信息方法
        Map<String, Object> map = orderServiceV2.orderPayMoney(payDto.getCouponCheckVersion(), ordersTotal,user,payUser,shop,info,orderItemList,operator,userMoney,userCouponIds,payDto,thirtApplication);
        //赠送增值金
        if(payDto.getGiveIncrease() != null && payDto.getGiveIncrease().compareTo(BigDecimal.ZERO) > 0){
            UserMoneyUtil.setNewUserMoneyUnclaimed(payDto.getPayUserId(),"老带新赠送(邀请人):邀请人增值金","结账处理老带新",ordersTotal.getOperatorId(),ordersTotal.getId(),ordersTotal.getAppIdCode(),ordersTotal.getId(),inviterMoney, UserMoneyUnclaimed.FUND_TYPE_VALUE_ADDED_FUND, OperationReasonConstants.OP_REASON_BRING_NEW_USER_GIFT,commonService,UserMoneyUnclaimed.YES);
        }
        if(map!=null && map.containsKey("orderId")){
            OrdersTotal sucOrdersTotal=commonService.selectOneByKey(OrdersTotalMapper.class,map.get("orderId"));
            if(OrderTotalConstants.PAY_STATUS_SUC==sucOrdersTotal.getPayStatus()){
phi_platform_user/src/main/java/com/hx/phip/service/impl/UserMoneyServiceImpl.java
@@ -1006,6 +1006,9 @@
            case OperationReasonConstants.OP_REASON_REFUND_CANCEL:
                userMoneyLog.setRecordType(UserMoneyLog.RECORD_TYPE_REASON_REFUND_CANCEL);
                break;
            case OperationReasonConstants.OP_REASON_INVITE_ORDER:
                userMoneyLog.setRecordType(UserMoneyLog.RECORD_TYPE_INVITE_ORDER);
                break;
            case OperationReasonConstants.OP_REASON_GIFT_0701:
                userMoneyLog.setRecordType(UserMoneyLog.RECORD_TYPE_REASON_GIFT_0701);
                break;
phi_platform_user/src/main/java/com/hx/phip/util/api/UserMoneyUtil.java
@@ -457,4 +457,53 @@
        }
        return data.toJavaObject(UserMoney.class);
    }
    /**
     * 用户资产处理
     * @param userId 用户标识,处理的用户
     * @param fundType 资金类型(UserMoneyUnclaimed):储值金 0、增值金 1、积分 2、预定金 3
     * @param worth 操作金额(单位元)
     * @param operationReason 操作类型(OperationReasonConstants)
     * @param originSubject  标题
     * @param remark  备注
     * @param operatorId 操作人
     * @param orderId 订单标识
     * @param commonId 公共标识(更具体的来源)
     * @param commonService
     */
    public static void setUserMoneyHandle(String userId,Integer fundType,BigDecimal worth,String operationReason,String originSubject
            ,String remark,String operatorId,String orderId,String commonId,CommonService commonService) {
        UserMoneyUnclaimed userMoneyUnclaimed=new UserMoneyUnclaimed();
        userMoneyUnclaimed.setUserId(userId);
        userMoneyUnclaimed.setFundType(fundType);
        userMoneyUnclaimed.setOriginChannel(OriginChannelConstants.ORIGIN_CHANNEL_PHIS_COMMON);
        userMoneyUnclaimed.setOperationReason(operationReason);
        userMoneyUnclaimed.setOpType(BaseEntity.YES);
        userMoneyUnclaimed.setCommonId(commonId);
        userMoneyUnclaimed.setOpNumber(worth);
        Map<String, String> operator = ApiOrderUtil.getOperator(commonService, operatorId);//获取操作人信息
        String operatorType=operator.get("operatorType");
        if("0".equals(operatorType)){
            userMoneyUnclaimed.setOperatorType(UserMoneyUnclaimed.OPERATOR_TYPE_ADMIN);//后台管理员
        }
        if("1".equals(operatorType)){
            userMoneyUnclaimed.setOperatorType(UserMoneyUnclaimed.OPERATOR_TYPE_EMPLOYEE);//员工
        }
        if("2".equals(operatorType)){
            userMoneyUnclaimed.setOperatorType(UserMoneyUnclaimed.OPERATOR_TYPE_USER);//用户
        }
        userMoneyUnclaimed.setOperatorId(operatorId);
        userMoneyUnclaimed.setOrderId(orderId);
        userMoneyUnclaimed.setOriginSubject(originSubject);
        userMoneyUnclaimed.setRemarks(remark);
        String userMoneyUnclaimedId = addUserMoneyUnclaimedData(userMoneyUnclaimed);
        if(StringUtils.isEmpty(userMoneyUnclaimedId)){
            throw new PlatTipsException(PlatformCode.ERROR_PARAMETER_NULL,"操作用户资金:用户资金新增报错!");
        }
    }
}