yujian
2020-04-23 c3f556e2413fbb5817f3907a73c4d4d2a2521cdb
Merge remote-tracking branch 'origin/div' into div
1个文件已删除
2个文件已修改
25 ■■■■■ 已修改文件
fanli/src/main/java/com/yeshi/fanli/exception/money/InviteOrderSubsidyDebtException.java 20 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
fanli/src/main/java/com/yeshi/fanli/mapping/money/OrderTeamRewardDebtRepayHistoryMapper.xml 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
fanli/src/main/java/com/yeshi/fanli/service/manger/order/TeamRewardManager.java 3 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
fanli/src/main/java/com/yeshi/fanli/exception/money/InviteOrderSubsidyDebtException.java
File was deleted
fanli/src/main/java/com/yeshi/fanli/mapping/money/OrderTeamRewardDebtRepayHistoryMapper.xml
@@ -11,7 +11,7 @@
        <result column="drh_beizhu" property="beiZhu" jdbcType="VARCHAR" />
        <result column="drh_create_time" property="createTime" jdbcType="TIMESTAMP" />
        <association property="debt" column="drh_debt_id"
            javaType="com.yeshi.fanli.entity.money.InviteOrderSubsidyDebt">
            javaType="com.yeshi.fanli.entity.money.OrderTeamRewardDebt">
            <id column="drh_debt_id" property="id" jdbcType="BIGINT" />
        </association>
    </resultMap>
fanli/src/main/java/com/yeshi/fanli/service/manger/order/TeamRewardManager.java
@@ -16,7 +16,6 @@
import com.yeshi.fanli.entity.taobao.TaoBaoOrder;
import com.yeshi.fanli.entity.taobao.TaoBaoWeiQuanOrder;
import com.yeshi.fanli.exception.ParamsException;
import com.yeshi.fanli.exception.money.InviteOrderSubsidyDebtException;
import com.yeshi.fanli.exception.money.TeamEincomeRecordException;
import com.yeshi.fanli.exception.money.TeamRewardDebtException;
import com.yeshi.fanli.exception.order.TaoBaoOrderException;
@@ -68,7 +67,7 @@
    }
    public void weiQuan(String orderNo, int sourceType, String tradeId)
            throws TaoBaoOrderException, InviteOrderSubsidyDebtException, TeamRewardDebtException {
            throws TaoBaoOrderException, TeamRewardDebtException {
        if (sourceType == Constant.SOURCE_TYPE_TAOBAO) {// 只处理淘宝的维权
            TaoBaoWeiQuanOrder taoBaoWeiQuanOrder = taoBaoWeiQuanOrderService.selectByTradeId(tradeId);