Merge remote-tracking branch 'origin/master-prod-new' into master-prod-new

fhx

2023-02-22 781e7046aee67b6e16256d8ff7965abcc3173ca7

Merge remote-tracking branch 'origin/master-prod-new' into master-prod-new

 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},inviteeId = #{inviteeId},inviteeName = #{inviteeName},userShopId = #{userShopId},userShopNo = #{userShopNo},userShopName = #{userShopName},userStatus = #{userStatus},hisCorpUserId = #{hisCorpUserId},hisCorpUserName = #{hisCorpUserName},doctorCorpUserId = #{doctorCorpUserId},doctorCorpUserName = #{doctorCorpUserName},channelId = #{channelId},channelName = #{channelName},channel2Id = #{channel2Id},channelName2 = #{channelName2},channelCategory = #{channelCategory},isOldBringNew = #{isOldBringNew},isCustomerConfirm = #{isCustomerConfirm},isBothTheOne = #{isBothTheOne},applyId = #{applyId},prescriptionNo = #{prescriptionNo},prescriptionId = #{prescriptionId},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},inviteeId = #{inviteeId},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},channelId = #{channelId},channelName = #{channelName},channel2Id = #{channel2Id},channelName2 = #{channelName2},channelCategory = #{channelCategory},isOldBringNew = #{isOldBringNew},isCustomerConfirm = #{isCustomerConfirm},isBothTheOne = #{isBothTheOne},applyId = #{applyId},prescriptionNo = #{prescriptionNo},prescriptionId = #{prescriptionId},isDel = #{isDel},createTime = #{createTime},editTime = #{editTime}
        </trim>
    </sql>
     
@@ -19,12 +19,8 @@
        <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,inviteeId,inviteeName,userShopId,userShopNo,userShopName,userStatus,hisCorpUserId,hisCorpUserName,doctorCorpUserId,doctorCorpUserName,channelId,channelName,channel2Id,channelName2,channelCategory,isOldBringNew,isCustomerConfirm,isBothTheOne,applyId,prescriptionNo,prescriptionId,isDel,createTime,editTime)  values (#{id},#{orderId},#{payNo},#{buyNum},#{activityId},#{activityName},#{isWholeDiscount},#{isEmployeeDiscount},#{discount},#{snapPayTotal},#{snapExecuteTotal},#{hisOrderNo},#{inviteeId},#{inviteeName},#{userShopId},#{userShopNo},#{userShopName},#{userStatus},#{hisCorpUserId},#{hisCorpUserName},#{doctorCorpUserId},#{doctorCorpUserName},#{channelId},#{channelName},#{channel2Id},#{channelName2},#{channelCategory},#{isOldBringNew},#{isCustomerConfirm},#{isBothTheOne},#{applyId},#{prescriptionNo},#{prescriptionId},#{isDel},#{createTime},#{editTime})
        insert into orders_info (id,orderId,payNo,buyNum,activityId,activityName,isWholeDiscount,isEmployeeDiscount,discount,snapPayTotal,snapExecuteTotal,hisOrderNo,inviteeId,inviteeName,userShopId,userShopNo,userShopName,userStatus,hisCorpUserId,hisCorpUserName,doctorCorpUserId,doctorCorpUserName,nurseCorpUserId,nurseCorpUserName,internetCorpUserId,internetCorpUserName,channelId,channelName,channel2Id,channelName2,channelCategory,isOldBringNew,isCustomerConfirm,isBothTheOne,applyId,prescriptionNo,prescriptionId,isDel,createTime,editTime)  values (#{id},#{orderId},#{payNo},#{buyNum},#{activityId},#{activityName},#{isWholeDiscount},#{isEmployeeDiscount},#{discount},#{snapPayTotal},#{snapExecuteTotal},#{hisOrderNo},#{inviteeId},#{inviteeName},#{userShopId},#{userShopNo},#{userShopName},#{userStatus},#{hisCorpUserId},#{hisCorpUserName},#{doctorCorpUserId},#{doctorCorpUserName},#{nurseCorpUserId},#{nurseCorpUserName},#{internetCorpUserId},#{internetCorpUserName},#{channelId},#{channelName},#{channel2Id},#{channelName2},#{channelCategory},#{isOldBringNew},#{isCustomerConfirm},#{isBothTheOne},#{applyId},#{prescriptionNo},#{prescriptionId},#{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,inviteeId,inviteeName,userShopId,userShopNo,userShopName,userStatus,hisCorpUserId,hisCorpUserName,doctorCorpUserId,doctorCorpUserName,channelId,channelName,channel2Id,channelName2,channelCategory,isOldBringNew,isCustomerConfirm,isBothTheOne,applyId,prescriptionNo,prescriptionId,isDel,createTime,editTime)  values (#{id},#{orderId},#{payNo},#{buyNum},#{activityId},#{activityName},#{isWholeDiscount},#{isEmployeeDiscount},#{discount},#{snapPayTotal},#{snapExecuteTotal},#{hisOrderNo},#{inviteeId},#{inviteeName},#{userShopId},#{userShopNo},#{userShopName},#{userStatus},#{hisCorpUserId},#{hisCorpUserName},#{doctorCorpUserId},#{doctorCorpUserName},#{channelId},#{channelName},#{channel2Id},#{channelName2},#{channelCategory},#{isOldBringNew},#{isCustomerConfirm},#{isBothTheOne},#{applyId},#{prescriptionNo},#{prescriptionId},#{isDel},#{createTime},#{editTime})
    </insert>

    <select id="selectList" resultType="com.hx.phiappt.model.order.OrderInfo" parameterType="com.hx.mybatisTool.SqlSentence" >
        ${sqlSentence}
@@ -55,14 +51,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,inviteeId,inviteeName,userShopId,userShopNo,userShopName,userStatus,hisCorpUserId,hisCorpUserName,doctorCorpUserId,doctorCorpUserName,channelId,channelName,channel2Id,channelName2,channelCategory,isOldBringNew,isCustomerConfirm,isBothTheOne,applyId,prescriptionNo,prescriptionId,isDel,createTime,editTime
            id,orderId,payNo,buyNum,activityId,activityName,isWholeDiscount,isEmployeeDiscount,discount,snapPayTotal,snapExecuteTotal,hisOrderNo,inviteeId,inviteeName,userShopId,userShopNo,userShopName,userStatus,hisCorpUserId,hisCorpUserName,doctorCorpUserId,doctorCorpUserName,nurseCorpUserId,nurseCorpUserName,internetCorpUserId,internetCorpUserName,channelId,channelName,channel2Id,channelName2,channelCategory,isOldBringNew,isCustomerConfirm,isBothTheOne,applyId,prescriptionNo,prescriptionId,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,inviteeId,inviteeName,userShopId,userShopNo,userShopName,userStatus,hisCorpUserId,hisCorpUserName,doctorCorpUserId,doctorCorpUserName,channelId,channelName,channel2Id,channelName2,channelCategory,isOldBringNew,isCustomerConfirm,isBothTheOne,applyId,prescriptionNo,prescriptionId,isDel,createTime,editTime
            id,orderId,payNo,buyNum,activityId,activityName,isWholeDiscount,isEmployeeDiscount,discount,snapPayTotal,snapExecuteTotal,hisOrderNo,inviteeId,inviteeName,userShopId,userShopNo,userShopName,userStatus,hisCorpUserId,hisCorpUserName,doctorCorpUserId,doctorCorpUserName,nurseCorpUserId,nurseCorpUserName,internetCorpUserId,internetCorpUserName,channelId,channelName,channel2Id,channelName2,channelCategory,isOldBringNew,isCustomerConfirm,isBothTheOne,applyId,prescriptionNo,prescriptionId,isDel,createTime,editTime
        from orders_info
        WHERE id = #{value}
    </select>
@@ -87,4 +83,7 @@
        delete from orders_info WHERE id = #{value}
    </delete>
    
    <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,inviteeId,inviteeName,userShopId,userShopNo,userShopName,userStatus,hisCorpUserId,hisCorpUserName,doctorCorpUserId,doctorCorpUserName,channelId,channelName,channel2Id,channelName2,channelCategory,isOldBringNew,isCustomerConfirm,isBothTheOne,applyId,prescriptionNo,prescriptionId,isDel,createTime,editTime)  values (#{id},#{orderId},#{payNo},#{buyNum},#{activityId},#{activityName},#{isWholeDiscount},#{isEmployeeDiscount},#{discount},#{snapPayTotal},#{snapExecuteTotal},#{hisOrderNo},#{inviteeId},#{inviteeName},#{userShopId},#{userShopNo},#{userShopName},#{userStatus},#{hisCorpUserId},#{hisCorpUserName},#{doctorCorpUserId},#{doctorCorpUserName},#{channelId},#{channelName},#{channel2Id},#{channelName2},#{channelCategory},#{isOldBringNew},#{isCustomerConfirm},#{isBothTheOne},#{applyId},#{prescriptionNo},#{prescriptionId},#{isDel},#{createTime},#{editTime})
    </insert>
</mapper>

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

@@ -8,7 +8,7 @@
    <!-- 整个实体类修改，表字段=实体类字段-->
    <sql id="Update_Column_All">
        <trim prefixOverrides=",">
            ,numberNo = #{numberNo},refundNumberNo = #{refundNumberNo},name = #{name},paymentMethodId = #{paymentMethodId},actualTotal = #{actualTotal},realRefundTotal = #{realRefundTotal},isMoneyPay = #{isMoneyPay},isExecute = #{isExecute},isPay = #{isPay},type = #{type},orderId = #{orderId},refundRecordId = #{refundRecordId},refundMethodTransId = #{refundMethodTransId},payee = #{payee},openBank = #{openBank},openBranch = #{openBranch},account = #{account},remarks = #{remarks},consumePayId = #{consumePayId},isDel = #{isDel},createTime = #{createTime},editTime = #{editTime}
            ,numberNo = #{numberNo},name = #{name},paymentMethodId = #{paymentMethodId},refundNumberNo = #{refundNumberNo},refundName = #{refundName},refundMethodId = #{refundMethodId},actualTotal = #{actualTotal},realRefundTotal = #{realRefundTotal},isMoneyPay = #{isMoneyPay},isExecute = #{isExecute},isPay = #{isPay},isMoneyPayRefund = #{isMoneyPayRefund},isExecuteRefund = #{isExecuteRefund},isPayRefund = #{isPayRefund},type = #{type},orderId = #{orderId},refundRecordId = #{refundRecordId},refundMethodTransId = #{refundMethodTransId},payee = #{payee},openBank = #{openBank},openBranch = #{openBranch},account = #{account},remarks = #{remarks},consumePayId = #{consumePayId},isDel = #{isDel},createTime = #{createTime},editTime = #{editTime}
        </trim>
    </sql>
     
@@ -19,8 +19,12 @@
        <selectKey keyProperty="id" resultType="String" order="BEFORE">
               select replace(uuid(),'-','') from dual
        </selectKey>
        insert into refund_record_method (id,numberNo,refundNumberNo,name,paymentMethodId,actualTotal,realRefundTotal,isMoneyPay,isExecute,isPay,type,orderId,refundRecordId,refundMethodTransId,payee,openBank,openBranch,account,remarks,consumePayId,isDel,createTime,editTime)  values (#{id},#{numberNo},#{refundNumberNo},#{name},#{paymentMethodId},#{actualTotal},#{realRefundTotal},#{isMoneyPay},#{isExecute},#{isPay},#{type},#{orderId},#{refundRecordId},#{refundMethodTransId},#{payee},#{openBank},#{openBranch},#{account},#{remarks},#{consumePayId},#{isDel},#{createTime},#{editTime})
        insert into refund_record_method (id,numberNo,name,paymentMethodId,refundNumberNo,refundName,refundMethodId,actualTotal,realRefundTotal,isMoneyPay,isExecute,isPay,isMoneyPayRefund,isExecuteRefund,isPayRefund,type,orderId,refundRecordId,refundMethodTransId,payee,openBank,openBranch,account,remarks,consumePayId,isDel,createTime,editTime)  values (#{id},#{numberNo},#{name},#{paymentMethodId},#{refundNumberNo},#{refundName},#{refundMethodId},#{actualTotal},#{realRefundTotal},#{isMoneyPay},#{isExecute},#{isPay},#{isMoneyPayRefund},#{isExecuteRefund},#{isPayRefund},#{type},#{orderId},#{refundRecordId},#{refundMethodTransId},#{payee},#{openBank},#{openBranch},#{account},#{remarks},#{consumePayId},#{isDel},#{createTime},#{editTime})
    </insert>

    <insert id="insertById" parameterType="com.hx.phiappt.model.refund.RefundRecordMethod">
        insert into refund_record_method (id,numberNo,name,paymentMethodId,refundNumberNo,refundName,refundMethodId,actualTotal,realRefundTotal,isMoneyPay,isExecute,isPay,isMoneyPayRefund,isExecuteRefund,isPayRefund,type,orderId,refundRecordId,refundMethodTransId,payee,openBank,openBranch,account,remarks,consumePayId,isDel,createTime,editTime)  values (#{id},#{numberNo},#{name},#{paymentMethodId},#{refundNumberNo},#{refundName},#{refundMethodId},#{actualTotal},#{realRefundTotal},#{isMoneyPay},#{isExecute},#{isPay},#{isMoneyPayRefund},#{isExecuteRefund},#{isPayRefund},#{type},#{orderId},#{refundRecordId},#{refundMethodTransId},#{payee},#{openBank},#{openBranch},#{account},#{remarks},#{consumePayId},#{isDel},#{createTime},#{editTime})
    </insert>

    <select id="selectList" resultType="com.hx.phiappt.model.refund.RefundRecordMethod" parameterType="com.hx.mybatisTool.SqlSentence" >
        ${sqlSentence}
@@ -51,14 +55,14 @@

    <select id="selectOneByKey" resultType="com.hx.phiappt.model.refund.RefundRecordMethod" parameterType="java.lang.Object" >
        select 
            id,numberNo,refundNumberNo,name,paymentMethodId,actualTotal,realRefundTotal,isMoneyPay,isExecute,isPay,type,orderId,refundRecordId,refundMethodTransId,payee,openBank,openBranch,account,remarks,consumePayId,isDel,createTime,editTime
            id,numberNo,name,paymentMethodId,refundNumberNo,refundName,refundMethodId,actualTotal,realRefundTotal,isMoneyPay,isExecute,isPay,isMoneyPayRefund,isExecuteRefund,isPayRefund,type,orderId,refundRecordId,refundMethodTransId,payee,openBank,openBranch,account,remarks,consumePayId,isDel,createTime,editTime
        from refund_record_method
        WHERE id = #{value}
    </select>

    <select id="selectOneByKeyBlob" resultType="com.hx.phiappt.model.refund.RefundRecordMethod" parameterType="java.lang.Object" >
        select 
            id,numberNo,refundNumberNo,name,paymentMethodId,actualTotal,realRefundTotal,isMoneyPay,isExecute,isPay,type,orderId,refundRecordId,refundMethodTransId,payee,openBank,openBranch,account,remarks,consumePayId,isDel,createTime,editTime
            id,numberNo,name,paymentMethodId,refundNumberNo,refundName,refundMethodId,actualTotal,realRefundTotal,isMoneyPay,isExecute,isPay,isMoneyPayRefund,isExecuteRefund,isPayRefund,type,orderId,refundRecordId,refundMethodTransId,payee,openBank,openBranch,account,remarks,consumePayId,isDel,createTime,editTime
        from refund_record_method
        WHERE id = #{value}
    </select>

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

@@ -8,7 +8,7 @@
    <!-- 整个实体类修改，表字段=实体类字段-->
    <sql id="Update_Column_All">
        <trim prefixOverrides=",">
            ,total = #{total},actualTotal = #{actualTotal},oriPrice = #{oriPrice},curPrice = #{curPrice},buyNum = #{buyNum},usedTotal = #{usedTotal},notUsedNum = #{notUsedNum},usedNum = #{usedNum},overdueNum = #{overdueNum},transferNum = #{transferNum},cancelNum = #{cancelNum},inBygNum = #{inBygNum},isSpa = #{isSpa},shopId = #{shopId},shopName = #{shopName},departmentCode = #{departmentCode},departmentName = #{departmentName},effectiveStatus = #{effectiveStatus},timeLimit = #{timeLimit},limitStartTime = #{limitStartTime},limitEndTime = #{limitEndTime},commonType = #{commonType},commonId = #{commonId},usedOne = #{usedOne},bodyPartsId = #{bodyPartsId},bodyPartsName = #{bodyPartsName},userProjectId = #{userProjectId},userId = #{userId},orderItemId = #{orderItemId},ordersTotalNumber = #{ordersTotalNumber},ordersTotalId = #{ordersTotalId},itemId = #{itemId},deductionTotalAmount = #{deductionTotalAmount},noDeductionAmount = #{noDeductionAmount},goodsId = #{goodsId},goodsName = #{goodsName},specs = #{specs},CIQ = #{CIQ},name = #{name},userLevel = #{userLevel},hisCorpUserId = #{hisCorpUserId},hisCorpUserIdName = #{hisCorpUserIdName},userShopId = #{userShopId},userShopName = #{userShopName},isDel = #{isDel},createTime = #{createTime},editTime = #{editTime}
            ,total = #{total},actualTotal = #{actualTotal},oriPrice = #{oriPrice},curPrice = #{curPrice},buyNum = #{buyNum},usedTotal = #{usedTotal},notUsedNum = #{notUsedNum},usedNum = #{usedNum},overdueNum = #{overdueNum},transferNum = #{transferNum},cancelNum = #{cancelNum},inBygNum = #{inBygNum},isSpa = #{isSpa},shopId = #{shopId},shopName = #{shopName},departmentCode = #{departmentCode},departmentName = #{departmentName},effectiveStatus = #{effectiveStatus},timeLimit = #{timeLimit},limitStartTime = #{limitStartTime},limitEndTime = #{limitEndTime},commonType = #{commonType},commonId = #{commonId},usedOne = #{usedOne},bodyPartsId = #{bodyPartsId},bodyPartsName = #{bodyPartsName},userProjectId = #{userProjectId},userId = #{userId},orderItemId = #{orderItemId},ordersTotalNumber = #{ordersTotalNumber},ordersTotalId = #{ordersTotalId},itemId = #{itemId},deductionTotalAmount = #{deductionTotalAmount},noDeductionAmount = #{noDeductionAmount},goodsId = #{goodsId},goodsName = #{goodsName},specs = #{specs},CIQ = #{CIQ},name = #{name},userLevel = #{userLevel},hisCorpUserId = #{hisCorpUserId},hisCorpUserIdName = #{hisCorpUserIdName},userShopId = #{userShopId},userShopName = #{userShopName},isTransfer = #{isTransfer},isDel = #{isDel},createTime = #{createTime},editTime = #{editTime}
        </trim>
    </sql>
     
@@ -19,8 +19,12 @@
        <selectKey keyProperty="id" resultType="String" order="BEFORE">
               select replace(uuid(),'-','') from dual
        </selectKey>
        insert into user_project_item (id,total,actualTotal,oriPrice,curPrice,buyNum,usedTotal,notUsedNum,usedNum,overdueNum,transferNum,cancelNum,inBygNum,isSpa,shopId,shopName,departmentCode,departmentName,effectiveStatus,timeLimit,limitStartTime,limitEndTime,commonType,commonId,usedOne,bodyPartsId,bodyPartsName,userProjectId,userId,orderItemId,ordersTotalNumber,ordersTotalId,itemId,deductionTotalAmount,noDeductionAmount,goodsId,goodsName,specs,CIQ,name,userLevel,hisCorpUserId,hisCorpUserIdName,userShopId,userShopName,isDel,createTime,editTime)  values (#{id},#{total},#{actualTotal},#{oriPrice},#{curPrice},#{buyNum},#{usedTotal},#{notUsedNum},#{usedNum},#{overdueNum},#{transferNum},#{cancelNum},#{inBygNum},#{isSpa},#{shopId},#{shopName},#{departmentCode},#{departmentName},#{effectiveStatus},#{timeLimit},#{limitStartTime},#{limitEndTime},#{commonType},#{commonId},#{usedOne},#{bodyPartsId},#{bodyPartsName},#{userProjectId},#{userId},#{orderItemId},#{ordersTotalNumber},#{ordersTotalId},#{itemId},#{deductionTotalAmount},#{noDeductionAmount},#{goodsId},#{goodsName},#{specs},#{CIQ},#{name},#{userLevel},#{hisCorpUserId},#{hisCorpUserIdName},#{userShopId},#{userShopName},#{isDel},#{createTime},#{editTime})
        insert into user_project_item (id,total,actualTotal,oriPrice,curPrice,buyNum,usedTotal,notUsedNum,usedNum,overdueNum,transferNum,cancelNum,inBygNum,isSpa,shopId,shopName,departmentCode,departmentName,effectiveStatus,timeLimit,limitStartTime,limitEndTime,commonType,commonId,usedOne,bodyPartsId,bodyPartsName,userProjectId,userId,orderItemId,ordersTotalNumber,ordersTotalId,itemId,deductionTotalAmount,noDeductionAmount,goodsId,goodsName,specs,CIQ,name,userLevel,hisCorpUserId,hisCorpUserIdName,userShopId,userShopName,isTransfer,isDel,createTime,editTime)  values (#{id},#{total},#{actualTotal},#{oriPrice},#{curPrice},#{buyNum},#{usedTotal},#{notUsedNum},#{usedNum},#{overdueNum},#{transferNum},#{cancelNum},#{inBygNum},#{isSpa},#{shopId},#{shopName},#{departmentCode},#{departmentName},#{effectiveStatus},#{timeLimit},#{limitStartTime},#{limitEndTime},#{commonType},#{commonId},#{usedOne},#{bodyPartsId},#{bodyPartsName},#{userProjectId},#{userId},#{orderItemId},#{ordersTotalNumber},#{ordersTotalId},#{itemId},#{deductionTotalAmount},#{noDeductionAmount},#{goodsId},#{goodsName},#{specs},#{CIQ},#{name},#{userLevel},#{hisCorpUserId},#{hisCorpUserIdName},#{userShopId},#{userShopName},#{isTransfer},#{isDel},#{createTime},#{editTime})
    </insert>

    <insert id="insertById" parameterType="com.hx.phiappt.model.user.UserProjectItem">
        insert into user_project_item (id,total,actualTotal,oriPrice,curPrice,buyNum,usedTotal,notUsedNum,usedNum,overdueNum,transferNum,cancelNum,inBygNum,isSpa,shopId,shopName,departmentCode,departmentName,effectiveStatus,timeLimit,limitStartTime,limitEndTime,commonType,commonId,usedOne,bodyPartsId,bodyPartsName,userProjectId,userId,orderItemId,ordersTotalNumber,ordersTotalId,itemId,deductionTotalAmount,noDeductionAmount,goodsId,goodsName,specs,CIQ,name,userLevel,hisCorpUserId,hisCorpUserIdName,userShopId,userShopName,isTransfer,isDel,createTime,editTime)  values (#{id},#{total},#{actualTotal},#{oriPrice},#{curPrice},#{buyNum},#{usedTotal},#{notUsedNum},#{usedNum},#{overdueNum},#{transferNum},#{cancelNum},#{inBygNum},#{isSpa},#{shopId},#{shopName},#{departmentCode},#{departmentName},#{effectiveStatus},#{timeLimit},#{limitStartTime},#{limitEndTime},#{commonType},#{commonId},#{usedOne},#{bodyPartsId},#{bodyPartsName},#{userProjectId},#{userId},#{orderItemId},#{ordersTotalNumber},#{ordersTotalId},#{itemId},#{deductionTotalAmount},#{noDeductionAmount},#{goodsId},#{goodsName},#{specs},#{CIQ},#{name},#{userLevel},#{hisCorpUserId},#{hisCorpUserIdName},#{userShopId},#{userShopName},#{isTransfer},#{isDel},#{createTime},#{editTime})
    </insert>

    <select id="selectList" resultType="com.hx.phiappt.model.user.UserProjectItem" parameterType="com.hx.mybatisTool.SqlSentence" >
        ${sqlSentence}
@@ -51,14 +55,14 @@

    <select id="selectOneByKey" resultType="com.hx.phiappt.model.user.UserProjectItem" parameterType="java.lang.Object" >
        select 
            id,total,actualTotal,oriPrice,curPrice,buyNum,usedTotal,notUsedNum,usedNum,overdueNum,transferNum,cancelNum,inBygNum,isSpa,shopId,shopName,departmentCode,departmentName,effectiveStatus,timeLimit,limitStartTime,limitEndTime,commonType,commonId,usedOne,bodyPartsId,bodyPartsName,userProjectId,userId,orderItemId,ordersTotalNumber,ordersTotalId,itemId,deductionTotalAmount,noDeductionAmount,goodsId,goodsName,specs,CIQ,name,userLevel,hisCorpUserId,hisCorpUserIdName,userShopId,userShopName,isDel,createTime,editTime
            id,total,actualTotal,oriPrice,curPrice,buyNum,usedTotal,notUsedNum,usedNum,overdueNum,transferNum,cancelNum,inBygNum,isSpa,shopId,shopName,departmentCode,departmentName,effectiveStatus,timeLimit,limitStartTime,limitEndTime,commonType,commonId,usedOne,bodyPartsId,bodyPartsName,userProjectId,userId,orderItemId,ordersTotalNumber,ordersTotalId,itemId,deductionTotalAmount,noDeductionAmount,goodsId,goodsName,specs,CIQ,name,userLevel,hisCorpUserId,hisCorpUserIdName,userShopId,userShopName,isTransfer,isDel,createTime,editTime
        from user_project_item
        WHERE id = #{value}
    </select>

    <select id="selectOneByKeyBlob" resultType="com.hx.phiappt.model.user.UserProjectItem" parameterType="java.lang.Object" >
        select 
            id,total,actualTotal,oriPrice,curPrice,buyNum,usedTotal,notUsedNum,usedNum,overdueNum,transferNum,cancelNum,inBygNum,isSpa,shopId,shopName,departmentCode,departmentName,effectiveStatus,timeLimit,limitStartTime,limitEndTime,commonType,commonId,usedOne,bodyPartsId,bodyPartsName,userProjectId,userId,orderItemId,ordersTotalNumber,ordersTotalId,itemId,deductionTotalAmount,noDeductionAmount,goodsId,goodsName,specs,CIQ,name,userLevel,hisCorpUserId,hisCorpUserIdName,userShopId,userShopName,isDel,createTime,editTime
            id,total,actualTotal,oriPrice,curPrice,buyNum,usedTotal,notUsedNum,usedNum,overdueNum,transferNum,cancelNum,inBygNum,isSpa,shopId,shopName,departmentCode,departmentName,effectiveStatus,timeLimit,limitStartTime,limitEndTime,commonType,commonId,usedOne,bodyPartsId,bodyPartsName,userProjectId,userId,orderItemId,ordersTotalNumber,ordersTotalId,itemId,deductionTotalAmount,noDeductionAmount,goodsId,goodsName,specs,CIQ,name,userLevel,hisCorpUserId,hisCorpUserIdName,userShopId,userShopName,isTransfer,isDel,createTime,editTime
        from user_project_item
        WHERE id = #{value}
    </select>

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

@@ -929,6 +929,7 @@
                    }
                    orderPayMethodDto.setMoney(payMethodDto.getMoney());
                    orderPayMethodDto.setRefundNumberNo(payMethodDto.getRefundNumberNo());
                    orderPayMethodDto.setRefundNumberName(payMethodDto.getRefundNumberName());
                    existence=true;
                }
            }
@@ -1227,6 +1228,11 @@
                    refundRecordMethod.setIsPay(consumePay.getIsPay());
                    //refundRecordMethod.setRealRefundTotal(money);//实退款总金额 后期需要修改
                    refundRecordMethod.setRemarks(remarks);
                    refundRecordMethod.setRefundName(refundMethod.getName());
                    refundRecordMethod.setRefundMethodId(refundMethod.getId());
                    refundRecordMethod.setIsMoneyPayRefund(refundMethod.getIsMoneyPay());
                    refundRecordMethod.setIsExecuteRefund(refundMethod.getIsExecute());
                    refundRecordMethod.setIsPayRefund(BaseEntity.YES);
                    if(money.compareTo(surplus)==1){
                        refundRecordMethod.setActualTotal(surplus);
                    }else {

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

@@ -184,6 +184,10 @@
            // 改集中工具类 复制于翔爷代码 统一方便修改代码
            isBothTheOne = OrderUtil.checkIsBothTheOne(ordersTotal, commonService, VisitRecordMapper.class);
            orderCreate.append("-结束判断是否是初诊单");
            //订单如果为复诊单那么就是老带新订单,对应禅道需求编号694
//            if(isBothTheOne !=null && isBothTheOne==OrderInfo.CONSULTATION){
//                isOldBringNew=BaseEntity.YES;
//            }
            nodeType=4;
        }catch (Exception e){
            String nodeText="";

 phi_platform_user/src/main/java/com/hx/phip/service/user/impl/UserProjectServiceImpl.java

@@ -422,6 +422,7 @@
        userProjectItem.setBuyNum(0);
        userProjectItem.setNoDeductionAmount(BigDecimal.ZERO);
        userProjectItem.setDeductionTotalAmount(BigDecimal.ZERO);
        userProjectItem.setIsTransfer(BaseEntity.YES);
        // 根据划扣次数计算划扣金额
        if (turnOutUserProjectItem.getDeductionTotalAmount() != null) {
            // 总金额和总次数要大于0

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

@@ -23,6 +23,7 @@
import com.hx.phiappt.model.cardItem.CardItemInfo;
import com.hx.phiappt.model.channels.Channels;
import com.hx.phiappt.model.consumables.Consumables;
import com.hx.phiappt.model.memberLevel.MemberLevel;
import com.hx.phiappt.model.order.*;
import com.hx.phiappt.model.project.ProjectInfo;
import com.hx.phiappt.model.project.ProjectSpecValue;
@@ -1375,6 +1376,23 @@
                orderInfo.setDoctorCorpUserName(StringUtils.isEmpty(doctorCorpEmployee.getCnName())?"":doctorCorpEmployee.getCnName());
            }
        }
        //设置用户所属护士:用户所属护士
        if(StringUtils.noNull(user.getNurseCorpUserId())){
            Employee nurseCorpEmployee=commonService.selectOneByKeyBlob(EmployeeMapper.class,user.getNurseCorpUserId());
            if(nurseCorpEmployee!=null){
                orderInfo.setNurseCorpUserId(nurseCorpEmployee.getId());
                orderInfo.setNurseCorpUserName(StringUtils.isEmpty(nurseCorpEmployee.getCnName())?"":nurseCorpEmployee.getCnName());
            }
        }
        //设置用户所属电网咨询师(tmk):用户所属电网咨询师
        if(StringUtils.noNull(user.getInternetCorpUserId())){
            Employee internetCorpEmployee=commonService.selectOneByKeyBlob(EmployeeMapper.class,user.getInternetCorpUserId());
            if(internetCorpEmployee!=null){
                orderInfo.setInternetCorpUserId(internetCorpEmployee.getId());
                orderInfo.setInternetCorpUserName(StringUtils.isEmpty(internetCorpEmployee.getCnName())?"":internetCorpEmployee.getCnName());
            }
        }

        commonService.insert(OrderInfoMapper.class, orderInfo);
        return activityName;
    }

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

@@ -90,11 +90,15 @@

        if(OrderTotalConstants.TYPE_RECHARGE.equals(ordersTotal.getType())){
            //充值订单需要把充值的储值金 拿回来   因为储值金需要开单来处理，所以不需要增加日志
            UserMoneyUtil.setNewUserMoneyUnclaimed(refundRecord.getUserId(),refundRecord.getRemarks(),"审核通过退款:支付方式储值金额退回",operationId,refundRecord.getOrderId(),appIdCode,refundRecord.getId(),new BigDecimal(String.valueOf(ordersTotal.getTotal())).negate(), UserMoneyUnclaimed.FUND_TYPE_STORED_VALUE_FUND, OperationReasonConstants.OP_REASON_RECHARGE_REFUND,commonService,UserMoneyUnclaimed.NO);
            OrderLog orderLog = RefundToolUtil.setOrderLog(refundRecord, operationId, operationNme, "储值金客户退回金额:"+ordersTotal.getTotal(), 0, OrderLogConstants.LOG_TYPE_REFUND);
            commonService.insert(OrderLogMapper.class,orderLog);
            //活动规则退款处理
            handActivityRule(commonService, operationId, operationNme, sqlSentence, map, refundRecord,ordersTotal,orderInfo);
            //判断金额不等于0，才执行操作，不然操作余额的时候会爆操作数量或金额不能为0
            if(ordersTotal.getTotal().compareTo(BigDecimal.ZERO)!=0){
                UserMoneyUtil.setNewUserMoneyUnclaimed(refundRecord.getUserId(),refundRecord.getRemarks(),"审核通过退款:支付方式储值金额退回",operationId,refundRecord.getOrderId(),appIdCode,refundRecord.getId(),new BigDecimal(String.valueOf(ordersTotal.getTotal())).negate(), UserMoneyUnclaimed.FUND_TYPE_STORED_VALUE_FUND, OperationReasonConstants.OP_REASON_RECHARGE_REFUND,commonService,UserMoneyUnclaimed.NO);
                OrderLog orderLog = RefundToolUtil.setOrderLog(refundRecord, operationId, operationNme, "储值金客户退回金额:"+ordersTotal.getTotal(), 0, OrderLogConstants.LOG_TYPE_REFUND);
                commonService.insert(OrderLogMapper.class,orderLog);
                //活动规则退款处理
                handActivityRule(commonService, operationId, operationNme, sqlSentence, map, refundRecord,ordersTotal,orderInfo);
            }

        }else if(OrderTotalConstants.TYPE_CARD_BAG.equals(ordersTotal.getType())){
            //卡包处理
            numberOfRefunds(commonService, operationId, operationNme, sqlSentence, map, refundRecord,ordersTotal,customParameter);
@@ -118,19 +122,28 @@
            if(PayMethodTypeConstants.PAY_STORED.equals(methodMap.get("numberNo"))){

                //储值金额　
                UserMoneyUtil.setNewUserMoneyUnclaimed(ordersTotal.getPayUserId()==null?ordersTotal.getUserId():ordersTotal.getPayUserId(),refundRecord.getRemarks(),"审核通过退款:支付方式储值金额退回",operationId,refundRecord.getOrderId(),appIdCode,refundRecord.getId(),actualTotal, UserMoneyUnclaimed.FUND_TYPE_STORED_VALUE_FUND, OperationReasonConstants.OP_REASON_RECHARGE_REFUND,commonService,UserMoneyUnclaimed.NO);
                OrderLog orderLog = RefundToolUtil.setOrderLog(refundRecord, operationId, operationNme, name+"退款金额:"+actualTotal, 0, OrderLogConstants.LOG_TYPE_REFUND);
                commonService.insert(OrderLogMapper.class,orderLog);
                //判断金额不等于0，才执行操作，不然操作余额的时候会爆操作数量或金额不能为0
                if(actualTotal.compareTo(BigDecimal.ZERO)!=0){
                    UserMoneyUtil.setNewUserMoneyUnclaimed(ordersTotal.getPayUserId()==null?ordersTotal.getUserId():ordersTotal.getPayUserId(),refundRecord.getRemarks(),"审核通过退款:支付方式储值金额退回",operationId,refundRecord.getOrderId(),appIdCode,refundRecord.getId(),actualTotal, UserMoneyUnclaimed.FUND_TYPE_STORED_VALUE_FUND, OperationReasonConstants.OP_REASON_RECHARGE_REFUND,commonService,UserMoneyUnclaimed.NO);
                    OrderLog orderLog = RefundToolUtil.setOrderLog(refundRecord, operationId, operationNme, name+"退款金额:"+actualTotal, 0, OrderLogConstants.LOG_TYPE_REFUND);
                    commonService.insert(OrderLogMapper.class,orderLog);
                }
            }else if(PayMethodTypeConstants.PAY_ADD_FUND.equals(methodMap.get("numberNo"))){
                //增值金
                UserMoneyUtil.setNewUserMoneyUnclaimed(ordersTotal.getPayUserId()==null?ordersTotal.getUserId():ordersTotal.getPayUserId(),refundRecord.getRemarks(),"审核通过退款:支付方式增值金退回",operationId,refundRecord.getOrderId(),appIdCode,refundRecord.getId(),actualTotal, UserMoneyUnclaimed.FUND_TYPE_VALUE_ADDED_FUND, OperationReasonConstants.OP_REASON_RECHARGE_REFUND,commonService,UserMoneyUnclaimed.YES);
                OrderLog orderLog = RefundToolUtil.setOrderLog(refundRecord,operationId,operationNme,name,0, OrderLogConstants.LOG_TYPE_REFUND);
                commonService.insert(OrderLogMapper.class,orderLog);
                //判断金额不等于0，才执行操作，不然操作余额的时候会爆操作数量或金额不能为0
                if(actualTotal.compareTo(BigDecimal.ZERO)!=0){
                    UserMoneyUtil.setNewUserMoneyUnclaimed(ordersTotal.getPayUserId()==null?ordersTotal.getUserId():ordersTotal.getPayUserId(),refundRecord.getRemarks(),"审核通过退款:支付方式增值金退回",operationId,refundRecord.getOrderId(),appIdCode,refundRecord.getId(),actualTotal, UserMoneyUnclaimed.FUND_TYPE_VALUE_ADDED_FUND, OperationReasonConstants.OP_REASON_RECHARGE_REFUND,commonService,UserMoneyUnclaimed.YES);
                    OrderLog orderLog = RefundToolUtil.setOrderLog(refundRecord,operationId,operationNme,name,0, OrderLogConstants.LOG_TYPE_REFUND);
                    commonService.insert(OrderLogMapper.class,orderLog);
                }
            }else if(PayMethodTypeConstants.PAY_INTEGRAL.equals(methodMap.get("numberNo"))){
                //积分
                UserMoneyUtil.setNewUserMoneyUnclaimed(ordersTotal.getPayUserId()==null?ordersTotal.getUserId():ordersTotal.getPayUserId(),refundRecord.getRemarks(),"审核通过退款:支付方式积分退回",operationId,refundRecord.getOrderId(),appIdCode,refundRecord.getId(),actualTotal, UserMoneyUnclaimed.FUND_TYPE_INTEGRAL,OperationReasonConstants.OP_REASON_RECHARGE_REFUND,commonService,UserMoneyUnclaimed.YES);
                OrderLog orderLog = RefundToolUtil.setOrderLog(refundRecord,operationId,operationNme,name+"退款金额:"+actualTotal,0, OrderLogConstants.LOG_TYPE_REFUND);
                commonService.insert(OrderLogMapper.class,orderLog);
                //判断金额不等于0，才执行操作，不然操作余额的时候会爆操作数量或金额不能为0
                if(actualTotal.compareTo(BigDecimal.ZERO)!=0){
                    UserMoneyUtil.setNewUserMoneyUnclaimed(ordersTotal.getPayUserId()==null?ordersTotal.getUserId():ordersTotal.getPayUserId(),refundRecord.getRemarks(),"审核通过退款:支付方式积分退回",operationId,refundRecord.getOrderId(),appIdCode,refundRecord.getId(),actualTotal, UserMoneyUnclaimed.FUND_TYPE_INTEGRAL,OperationReasonConstants.OP_REASON_RECHARGE_REFUND,commonService,UserMoneyUnclaimed.YES);
                    OrderLog orderLog = RefundToolUtil.setOrderLog(refundRecord,operationId,operationNme,name+"退款金额:"+actualTotal,0, OrderLogConstants.LOG_TYPE_REFUND);
                    commonService.insert(OrderLogMapper.class,orderLog);
                }
            }else {
                cashStatus=true;
                //现金支付
@@ -253,9 +266,15 @@
                if(activityActions!=null && activityActions.size()>0){
                    for (ActivityAction activityAction : activityActions) {
                        if(ActivityAction.TYPE_INTEGRAL.equals(activityAction.getType())){
                            UserMoneyUtil.setNewUserMoneyUnclaimed(refundRecord.getUserId(),refundRecord.getRemarks(),"退款扣减活动规则赠送积分",operationId,refundRecord.getOrderId(),ordersTotal.getAppIdCode(),refundRecord.getId(),new BigDecimal(activityAction.getWorth()).negate(), UserMoneyUnclaimed.FUND_TYPE_INTEGRAL,OperationReasonConstants.OP_REASON_RECHARGE_REFUND,commonService,UserMoneyUnclaimed.YES);
                            //判断金额不等于0，才执行操作，不然操作余额的时候会爆操作数量或金额不能为0
                            if(new BigDecimal(activityAction.getWorth()).negate().compareTo(BigDecimal.ZERO)!=0){
                                UserMoneyUtil.setNewUserMoneyUnclaimed(refundRecord.getUserId(),refundRecord.getRemarks(),"退款扣减活动规则赠送积分",operationId,refundRecord.getOrderId(),ordersTotal.getAppIdCode(),refundRecord.getId(),new BigDecimal(activityAction.getWorth()).negate(), UserMoneyUnclaimed.FUND_TYPE_INTEGRAL,OperationReasonConstants.OP_REASON_RECHARGE_REFUND,commonService,UserMoneyUnclaimed.YES);
                            }
                        }else if(ActivityAction.TYPE_VALUEADDEDFUND.equals(activityAction.getType())){
                            UserMoneyUtil.setNewUserMoneyUnclaimed(refundRecord.getUserId(),refundRecord.getRemarks(),"退款扣减活动规则赠送增值金",operationId,refundRecord.getOrderId(),ordersTotal.getAppIdCode(),refundRecord.getId(),new BigDecimal(activityAction.getWorth()).negate(), UserMoneyUnclaimed.FUND_TYPE_VALUE_ADDED_FUND,OperationReasonConstants.OP_REASON_RECHARGE_REFUND,commonService,UserMoneyUnclaimed.YES);
                            //判断金额不等于0，才执行操作，不然操作余额的时候会爆操作数量或金额不能为0
                            if(new BigDecimal(activityAction.getWorth()).negate().compareTo(BigDecimal.ZERO)!=0){
                                UserMoneyUtil.setNewUserMoneyUnclaimed(refundRecord.getUserId(),refundRecord.getRemarks(),"退款扣减活动规则赠送增值金",operationId,refundRecord.getOrderId(),ordersTotal.getAppIdCode(),refundRecord.getId(),new BigDecimal(activityAction.getWorth()).negate(), UserMoneyUnclaimed.FUND_TYPE_VALUE_ADDED_FUND,OperationReasonConstants.OP_REASON_RECHARGE_REFUND,commonService,UserMoneyUnclaimed.YES);
                            }
                        }else if(ActivityAction.TYPE_COUPON.equals(activityAction.getType())){
                            map.put("oldValidState",BaseEntity.YES);
                            map.put("newValidState",BaseEntity.NO);
@@ -481,15 +500,24 @@
                        break;
                    case INCREMENT:
                        //增值金
                        UserMoneyUtil.setNewUserMoneyUnclaimed(refundRecord.getUserId(),refundRecord.getRemarks(),"审核通过退款:促销赠送增值金扣减",operationId,refundRecord.getOrderId(),ordersTotal.getAppIdCode(),refundRecord.getId(),son.getRealRefundTotal().negate(), UserMoneyUnclaimed.FUND_TYPE_VALUE_ADDED_FUND, OperationReasonConstants.OP_REASON_RECHARGE_REFUND,commonService,UserMoneyUnclaimed.YES);
                        //判断金额不等于0，才执行操作，不然操作余额的时候会爆操作数量或金额不能为0
                        if(son.getRealRefundTotal().negate().compareTo(BigDecimal.ZERO)!=0){
                            UserMoneyUtil.setNewUserMoneyUnclaimed(refundRecord.getUserId(),refundRecord.getRemarks(),"审核通过退款:促销赠送增值金扣减",operationId,refundRecord.getOrderId(),ordersTotal.getAppIdCode(),refundRecord.getId(),son.getRealRefundTotal().negate(), UserMoneyUnclaimed.FUND_TYPE_VALUE_ADDED_FUND, OperationReasonConstants.OP_REASON_RECHARGE_REFUND,commonService,UserMoneyUnclaimed.YES);
                        }
                        break;
                    case STORED:
                        //储值金额
                        UserMoneyUtil.setNewUserMoneyUnclaimed(refundRecord.getUserId(),refundRecord.getRemarks(),"审核通过退款:促销赠送储值金额扣减",operationId,refundRecord.getOrderId(),ordersTotal.getAppIdCode(),refundRecord.getId(),son.getRealRefundTotal().negate(), UserMoneyUnclaimed.FUND_TYPE_STORED_VALUE_FUND, OperationReasonConstants.OP_REASON_RECHARGE_REFUND,commonService,UserMoneyUnclaimed.NO);
                        //判断金额不等于0，才执行操作，不然操作余额的时候会爆操作数量或金额不能为0
                        if(son.getRealRefundTotal().negate().compareTo(BigDecimal.ZERO)!=0){
                            UserMoneyUtil.setNewUserMoneyUnclaimed(refundRecord.getUserId(),refundRecord.getRemarks(),"审核通过退款:促销赠送储值金额扣减",operationId,refundRecord.getOrderId(),ordersTotal.getAppIdCode(),refundRecord.getId(),son.getRealRefundTotal().negate(), UserMoneyUnclaimed.FUND_TYPE_STORED_VALUE_FUND, OperationReasonConstants.OP_REASON_RECHARGE_REFUND,commonService,UserMoneyUnclaimed.NO);
                        }
                        break;
                    case INTEGRAL:
                        //积分
                        UserMoneyUtil.setNewUserMoneyUnclaimed(refundRecord.getUserId(),refundRecord.getRemarks(),"审核通过退款:促销赠送积分扣减",operationId,refundRecord.getOrderId(),ordersTotal.getAppIdCode(),refundRecord.getId(),son.getRealRefundTotal().negate(), UserMoneyUnclaimed.FUND_TYPE_INTEGRAL,OperationReasonConstants.OP_REASON_RECHARGE_REFUND,commonService,UserMoneyUnclaimed.YES);
                        //判断金额不等于0，才执行操作，不然操作余额的时候会爆操作数量或金额不能为0
                        if(son.getRealRefundTotal().negate().compareTo(BigDecimal.ZERO)!=0){
                            UserMoneyUtil.setNewUserMoneyUnclaimed(refundRecord.getUserId(),refundRecord.getRemarks(),"审核通过退款:促销赠送积分扣减",operationId,refundRecord.getOrderId(),ordersTotal.getAppIdCode(),refundRecord.getId(),son.getRealRefundTotal().negate(), UserMoneyUnclaimed.FUND_TYPE_INTEGRAL,OperationReasonConstants.OP_REASON_RECHARGE_REFUND,commonService,UserMoneyUnclaimed.YES);
                        }
                        break;
                }
            }
@@ -588,15 +616,24 @@
                        break;
                    case INCREMENT:
                        //增值金
                        UserMoneyUtil.setNewUserMoneyUnclaimed(refundRecord.getUserId(),refundRecord.getRemarks(),"审核通过退款:促销赠送增值金扣减",operationId,refundRecord.getOrderId(),ordersTotal.getAppIdCode(),refundRecord.getId(),son.getRealRefundTotal().negate(), UserMoneyUnclaimed.FUND_TYPE_VALUE_ADDED_FUND, OperationReasonConstants.OP_REASON_RECHARGE_REFUND,commonService,UserMoneyUnclaimed.YES);
                        //判断金额不等于0，才执行操作，不然操作余额的时候会爆操作数量或金额不能为0
                        if(son.getRealRefundTotal().negate().compareTo(BigDecimal.ZERO)!=0){
                            UserMoneyUtil.setNewUserMoneyUnclaimed(refundRecord.getUserId(),refundRecord.getRemarks(),"审核通过退款:促销赠送增值金扣减",operationId,refundRecord.getOrderId(),ordersTotal.getAppIdCode(),refundRecord.getId(),son.getRealRefundTotal().negate(), UserMoneyUnclaimed.FUND_TYPE_VALUE_ADDED_FUND, OperationReasonConstants.OP_REASON_RECHARGE_REFUND,commonService,UserMoneyUnclaimed.YES);
                        }
                        break;
                    case STORED:
                        //储值金额
                        UserMoneyUtil.setNewUserMoneyUnclaimed(refundRecord.getUserId(),refundRecord.getRemarks(),"审核通过退款:促销赠送储值金额扣减",operationId,refundRecord.getOrderId(),ordersTotal.getAppIdCode(),refundRecord.getId(),son.getRealRefundTotal().negate(), UserMoneyUnclaimed.FUND_TYPE_STORED_VALUE_FUND, OperationReasonConstants.OP_REASON_RECHARGE_REFUND,commonService,UserMoneyUnclaimed.NO);
                        //判断金额不等于0，才执行操作，不然操作余额的时候会爆操作数量或金额不能为0
                        if(son.getRealRefundTotal().negate().compareTo(BigDecimal.ZERO)!=0){
                            UserMoneyUtil.setNewUserMoneyUnclaimed(refundRecord.getUserId(),refundRecord.getRemarks(),"审核通过退款:促销赠送储值金额扣减",operationId,refundRecord.getOrderId(),ordersTotal.getAppIdCode(),refundRecord.getId(),son.getRealRefundTotal().negate(), UserMoneyUnclaimed.FUND_TYPE_STORED_VALUE_FUND, OperationReasonConstants.OP_REASON_RECHARGE_REFUND,commonService,UserMoneyUnclaimed.NO);
                        }
                        break;
                    case INTEGRAL:
                        //积分
                        UserMoneyUtil.setNewUserMoneyUnclaimed(refundRecord.getUserId(),refundRecord.getRemarks(),"审核通过退款:促销赠送积分扣减",operationId,refundRecord.getOrderId(),ordersTotal.getAppIdCode(),refundRecord.getId(),son.getRealRefundTotal().negate(), UserMoneyUnclaimed.FUND_TYPE_INTEGRAL,OperationReasonConstants.OP_REASON_RECHARGE_REFUND,commonService,UserMoneyUnclaimed.YES);
                        //判断金额不等于0，才执行操作，不然操作余额的时候会爆操作数量或金额不能为0
                        if(son.getRealRefundTotal().negate().compareTo(BigDecimal.ZERO)!=0){
                            UserMoneyUtil.setNewUserMoneyUnclaimed(refundRecord.getUserId(),refundRecord.getRemarks(),"审核通过退款:促销赠送积分扣减",operationId,refundRecord.getOrderId(),ordersTotal.getAppIdCode(),refundRecord.getId(),son.getRealRefundTotal().negate(), UserMoneyUnclaimed.FUND_TYPE_INTEGRAL,OperationReasonConstants.OP_REASON_RECHARGE_REFUND,commonService,UserMoneyUnclaimed.YES);
                        }
                        break;
                }
            }