935090232@qq.com
2021-02-03 0944bb0dedeaf1c0e1b3fa7caa38ebaf11831fa8
1、修改时间,修改交易流水bug
3 files modified
22 ■■■■ changed files
zq-erp/src/main/java/com/matrix/system/hive/action/OrderController.java 12 ●●●●● patch | view | raw | blame | history
zq-erp/src/main/java/com/matrix/system/hive/dao/SysOrderFlowDao.java 3 ●●●●● patch | view | raw | blame | history
zq-erp/src/main/resources/mybatis/mapper/hive/SysOrderFlowDao.xml 7 ●●●● patch | view | raw | blame | history
zq-erp/src/main/java/com/matrix/system/hive/action/OrderController.java
@@ -16,10 +16,7 @@
import com.matrix.system.constance.Dictionary;
import com.matrix.system.constance.SystemConstance;
import com.matrix.system.hive.bean.*;
import com.matrix.system.hive.dao.MoneyCardUseDao;
import com.matrix.system.hive.dao.SysOrderDao;
import com.matrix.system.hive.dao.SysOrderItemDao;
import com.matrix.system.hive.dao.SysShopInfoDao;
import com.matrix.system.hive.dao.*;
import com.matrix.system.hive.plugin.util.CollectionUtils;
import com.matrix.system.hive.pojo.ShoppingCarItem;
import com.matrix.system.hive.pojo.ShoppingCarItemsVo;
@@ -84,6 +81,9 @@
    @Autowired
    private SysOrderFlowService sysOrderFlowService;
    @Autowired
    private SysOrderFlowDao sysOrderFlowDao;
    @Autowired
    RabiitMqTemplate rabiitMqTemplate;
@@ -288,6 +288,10 @@
        achieveNew.setOrderId(sysOrder.getId());
        achieveNew.setDatatime(sysOrder.getPayTime());
        achieveNewService.modifyAchieveTime(achieveNew);
        //更新收款流水时间
        sysOrderFlowDao.updateTimeByOrderId(sysOrder.getId(),sysOrder.getPayTime());
        return new AjaxResult(AjaxResult.STATUS_SUCCESS, "修改成功");
    }
zq-erp/src/main/java/com/matrix/system/hive/dao/SysOrderFlowDao.java
@@ -5,6 +5,7 @@
import com.matrix.system.hive.vo.OrderFlowVo;
import org.apache.ibatis.annotations.Param;
import java.util.Date;
import java.util.List;
public interface SysOrderFlowDao {
@@ -18,4 +19,6 @@
    List<OrderFlowVo> selectInPage(@Param("record") OrderFlowListDto orderFlowListDto);
    Integer selectTotal(@Param("record")OrderFlowListDto orderFlowListDto);
    Integer updateTimeByOrderId(@Param("orderId") Long orderId, @Param("payTime") Date payTime);
}
zq-erp/src/main/resources/mybatis/mapper/hive/SysOrderFlowDao.xml
@@ -60,8 +60,13 @@
        #{companyId}
        )
    </insert>
    <update id="updateTimeByOrderId">
        UPDATE sys_order_flow set
        create_time=#{payTime}
        where order_id=#{orderId}
    </update>
    <select id="selectByOrderId" resultMap="SysOrderFlowMap">
    <select id="selectByOrderId" resultMap="SysOrderFlowMap">
        select a.*, b.order_no from sys_order_flow a
        left join sys_order b on a.order_id=b.id
        where order_id=#{orderId}