chenjiahe
2023-05-10 55a431d475f332fb8e1b039d5adbd0c5ef34bf38
作废退款-测
4个文件已修改
22 ■■■■ 已修改文件
phi_platform_common/src/main/java/com/hx/phip/AutoDomeUtil.java 4 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
phi_platform_common/src/main/resources/mapper/platform/OrdersActivityInfoItemMapper.xml 12 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
phi_platform_common/src/main/resources/mapper/platform/OrdersActivityInfoMapper.xml 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
phi_platform_user/src/main/java/com/hx/phip/service/impl/EmployeeRoleServiceImpl.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
phi_platform_common/src/main/java/com/hx/phip/AutoDomeUtil.java
@@ -6,6 +6,8 @@
import com.hx.phiappt.model.cardItem.CardEquity;
import com.hx.phiappt.model.order.OrderInfo;
import com.hx.phiappt.model.order.OrderItemSon;
import com.hx.phiappt.model.order.OrdersActivityInfo;
import com.hx.phiappt.model.order.OrdersActivityInfoItem;
import com.hx.phiappt.model.project.ProjectShopPrice;
import com.hx.phiappt.model.refund.RefundRecord;
import com.hx.phiappt.model.refund.RefundRecordReceipt;
@@ -42,7 +44,7 @@
        urlData.serviceImplUrlData(controllerPackRoot,packageName + ".service.impl");
        urlData.mapperUrlData(commonPackRootResourse, "mapper.platform");
        Class<?> clas = UserCardUsed.class;
        Class<?> clas = OrdersActivityInfoItem.class;
        //dao
         GeneratorUtil.generatorDao(clas,urlData);
        //mapper
phi_platform_common/src/main/resources/mapper/platform/OrdersActivityInfoItemMapper.xml
@@ -8,7 +8,7 @@
    <!-- 整个实体类修改,表字段=实体类字段-->
    <sql id="Update_Column_All">
        <trim prefixOverrides=",">
            ,orderId = #{orderId},activityInfoId = #{activityInfoId},type = #{type},worth = #{worth},worthName = #{worthName},activityGroupId = #{activityGroupId},activityRuleId = #{activityRuleId},crmCouponId = #{crmCouponId},crmCouponName = #{crmCouponName},platformType = #{platformType},performStatus = #{performStatus},isDel = #{isDel},createTime = #{createTime},editTime = #{editTime}
            ,orderId = #{orderId},activityInfoId = #{activityInfoId},performStatus = #{performStatus},handleStatus = #{handleStatus},type = #{type},worth = #{worth},worthName = #{worthName},activityActionId = #{activityActionId},activityGroupId = #{activityGroupId},activityRuleId = #{activityRuleId},crmCouponId = #{crmCouponId},crmCouponName = #{crmCouponName},platformType = #{platformType},couponNumberId = #{couponNumberId},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 orders_activity_info_item (id,orderId,activityInfoId,type,worth,worthName,activityGroupId,activityRuleId,crmCouponId,crmCouponName,platformType,performStatus,isDel,createTime,editTime)  values (#{id},#{orderId},#{activityInfoId},#{type},#{worth},#{worthName},#{activityGroupId},#{activityRuleId},#{crmCouponId},#{crmCouponName},#{platformType},#{performStatus},#{isDel},#{createTime},#{editTime})
        insert into orders_activity_info_item (id,orderId,activityInfoId,performStatus,handleStatus,type,worth,worthName,activityActionId,activityGroupId,activityRuleId,crmCouponId,crmCouponName,platformType,couponNumberId,isDel,createTime,editTime)  values (#{id},#{orderId},#{activityInfoId},#{performStatus},#{handleStatus},#{type},#{worth},#{worthName},#{activityActionId},#{activityGroupId},#{activityRuleId},#{crmCouponId},#{crmCouponName},#{platformType},#{couponNumberId},#{isDel},#{createTime},#{editTime})
    </insert>
    <insert id="insertById" parameterType="com.hx.phiappt.model.order.OrdersActivityInfoItem">
        insert into orders_activity_info_item (id,orderId,activityInfoId,performStatus,handleStatus,type,worth,worthName,activityActionId,activityGroupId,activityRuleId,crmCouponId,crmCouponName,platformType,couponNumberId,isDel,createTime,editTime)  values (#{id},#{orderId},#{activityInfoId},#{performStatus},#{handleStatus},#{type},#{worth},#{worthName},#{activityActionId},#{activityGroupId},#{activityRuleId},#{crmCouponId},#{crmCouponName},#{platformType},#{couponNumberId},#{isDel},#{createTime},#{editTime})
    </insert>
    <select id="selectList" resultType="com.hx.phiappt.model.order.OrdersActivityInfoItem" parameterType="com.hx.mybatisTool.SqlSentence" >
        ${sqlSentence}
@@ -51,14 +55,14 @@
    <select id="selectOneByKey" resultType="com.hx.phiappt.model.order.OrdersActivityInfoItem" parameterType="java.lang.Object" >
        select 
            id,orderId,activityInfoId,type,worth,worthName,activityGroupId,activityRuleId,crmCouponId,crmCouponName,platformType,performStatus,isDel,createTime,editTime
            id,orderId,activityInfoId,performStatus,handleStatus,type,worth,worthName,activityActionId,activityGroupId,activityRuleId,crmCouponId,crmCouponName,platformType,couponNumberId,isDel,createTime,editTime
        from orders_activity_info_item
        WHERE id = #{value}
    </select>
    <select id="selectOneByKeyBlob" resultType="com.hx.phiappt.model.order.OrdersActivityInfoItem" parameterType="java.lang.Object" >
        select 
            id,orderId,activityInfoId,type,worth,worthName,activityGroupId,activityRuleId,crmCouponId,crmCouponName,platformType,performStatus,isDel,createTime,editTime
            id,orderId,activityInfoId,performStatus,handleStatus,type,worth,worthName,activityActionId,activityGroupId,activityRuleId,crmCouponId,crmCouponName,platformType,couponNumberId,isDel,createTime,editTime
        from orders_activity_info_item
        WHERE id = #{value}
    </select>
phi_platform_common/src/main/resources/mapper/platform/OrdersActivityInfoMapper.xml
@@ -22,6 +22,10 @@
        insert into orders_activity_info (id,orderId,activityId,activityName,isDel,createTime,editTime)  values (#{id},#{orderId},#{activityId},#{activityName},#{isDel},#{createTime},#{editTime})
    </insert>
    <insert id="insertById" parameterType="com.hx.phiappt.model.order.OrdersActivityInfo">
        insert into orders_activity_info (id,orderId,activityId,activityName,isDel,createTime,editTime)  values (#{id},#{orderId},#{activityId},#{activityName},#{isDel},#{createTime},#{editTime})
    </insert>
    <select id="selectList" resultType="com.hx.phiappt.model.order.OrdersActivityInfo" parameterType="com.hx.mybatisTool.SqlSentence" >
        ${sqlSentence}
    </select>
phi_platform_user/src/main/java/com/hx/phip/service/impl/EmployeeRoleServiceImpl.java
@@ -100,7 +100,7 @@
        Map<String,Object> values = new HashMap<>();
        values.put("id",id);
        sqlSentence.sqlSentence("SELECT er.*,ert.name AS roleName FROM employee_role er LEFT JOIN employee_role_type ert ON ert.id = er.roleTypeId  WHERE id = #{m.id}",values);
        sqlSentence.sqlSentence("SELECT er.*,ert.name AS roleName FROM employee_role er LEFT JOIN employee_role_type ert ON ert.id = er.roleTypeId  WHERE er.id = #{m.id}",values);
        return employeeRoleMapper.selectOne(sqlSentence);
    }