Merge branch 'xin' into pxb

彭雪彬

2025-07-17 b919b454bccc18d67b7109a09357499d09211eac

Merge branch 'xin' into pxb

 oying-system/src/main/java/com/oying/modules/sh/mapper/OrderReturnMapper.java

@@ -20,11 +20,11 @@

    IPage<OrderReturn> findAll(@Param("criteria") OrderReturnQueryCriteria criteria, @Param("blurry") String blurry, Page<Object> page);

    List<OrderReturn> findAll(@Param("criteria") OrderReturnQueryCriteria criteria, @Param("criteria") String blurry);
    List<OrderReturn> findAll(@Param("criteria") OrderReturnQueryCriteria criteria, @Param("blurry") String blurry);

    OrderReturn getByReturnNum(String returnNum);

    void updatePayStatus(String returnNum, String status, String time);

    Long countAll(@Param("criteria") OrderReturnQueryCriteria criteria, @Param("criteria") String blurry);
    Long countAll(@Param("criteria") OrderReturnQueryCriteria criteria, @Param("blurry") String blurry);
}

 oying-system/src/main/java/com/oying/modules/sh/service/impl/OrderOperationLogServiceImpl.java

@@ -87,7 +87,10 @@
        resources.setOperation(statusEnum.getKey());
        resources.setOperationDescribe(statusEnum.getValue());
        resources.setRemark(username + "：" + time + ">" + statusEnum.getValue() + "：" + response.getOrder().getOrderNum());
        resources.setSnapshotData(JSON.toJSONString(response));
        Map<String, Object> map = new LinkedHashMap<>();
        map.put("order", response.getOrder());
        map.put("address", response.getAddress());
        resources.setSnapshotData(JSON.toJSONString(map));
        resources.setOperationTime(time);
        orderOperationLogMapper.insert(resources);
        orderMapper.updateOrderStatus(response.getOrder().getOrderNum(), statusEnum.getKey(), statusEnum.getValue());

 oying-system/src/main/resources/mapper/sh/OrderReturnMapper.xml

@@ -143,7 +143,11 @@
        <include refid="Base_Column_List"/>
        from sh_order_return as o
        <include refid="Where_sql"/>
        order by o.return_id desc ) o
        order by o.return_id desc
        <if test="criteria.offset != null">
            limit #{criteria.offset}, #{criteria.size}
        </if>
        ) o
        left join sh_order_return_product_snapshot as p on p.return_num = o.return_num
        <include refid="Where_Sql_Product"/>
        order by o.order_id desc