merge

zhongzheng-system/src/main/java/com/zhongzheng/modules/top/goods/service/impl/TopOldOrderServiceImpl.java

@@ -878,7 +878,7 @@ public class TopOldOrderServiceImpl extends ServiceImpl<TopOldOrderMapper, TopOl
     @Override
     public List<TopOldOrderGoodsListVo> getOrderGoodsList(TopOldOrderGoodsQuery query) {
         TopOldOrder order = baseMapper.getOrderBySn(query.getOrderSn());
-        if (query.getOrderFrom() == 1) {
+        if (order.getOrderFrom() == 1) {
             //新系统订单
             List<TopOldOrderGoodsListVo> topOldOrderGoodsListVos = orderGoodsService.listByOrderSn(query);
             if (CollectionUtils.isNotEmpty(topOldOrderGoodsListVos)) {

zhongzheng-system/src/main/resources/mapper/modules/top/TopOldOrderMapper.xml

@@ -49,7 +49,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
                 <if test="businessFullName != null and businessFullName != '' and (userCard == null or userCard == '')">
                     FROM `v_top_order_business`  where INSTR( business_full_name,#{businessFullName} ) > 0
                 </if>
-                <if test="userCard != null and userCard != '' and (businessFullName == null and businessFullName == '')">
+                <if test="(userCard != null and userCard != '') and (businessFullName == null or businessFullName == '')">
                     FROM `v_top_order_card`  where user_card = #{userCard,typeHandler=com.zhongzheng.common.type.EncryptHandler}
                 </if>
                 <if test="userCard != null and userCard != '' and businessFullName != null and businessFullName != ''">
@@ -111,6 +111,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 --             OR vto.course_org LIKE CONCAT( '%', #{keyword}, '%' )
             OR vto.order_org LIKE CONCAT( '%', #{keyword}, '%' ))
         </if>
+        order by vto.create_time DESC
     </select>